diff --git a/adm/UDLIST b/adm/UDLIST index b6d6b2fb69..1ea34dcd0d 100644 --- a/adm/UDLIST +++ b/adm/UDLIST @@ -241,7 +241,6 @@ n BinObjMgt n BinTools n CDF n CDM -n FWOSDriver n PCDM n StdLDrivers n StdLPersistent @@ -269,7 +268,6 @@ n XmlMNaming n XmlObjMgt r StdResource r XmlOcafResource -t FWOSPlugin t TKBin t TKBinL diff --git a/dox/license.md b/dox/license.md deleted file mode 100755 index bc82745bf3..0000000000 --- a/dox/license.md +++ /dev/null @@ -1,521 +0,0 @@ -License {#occt_public_license} -======= - -Open CASCADE Technology is available under GNU Lesser General Public License -(LGPL) version 2.1 with additional exception. - -@section license_lgpl_21 GNU LESSER GENERAL PUBLIC LICENSE - - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - [This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - -### Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - -### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -- 0. This License Agreement applies to any software library or other - program which contains a notice placed by the copyright holder or - other authorized party saying it may be distributed under the terms of - this Lesser General Public License (also called "this License"). - Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data - prepared so as to be conveniently linked with application programs - (which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work - which has been distributed under these terms. A "work based on the - Library" means either the Library or any derivative work under - copyright law: that is to say, a work containing the Library or a - portion of it, either verbatim or with modifications and/or translated - straightforwardly into another language. (Hereinafter, translation is - included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for - making modifications to it. For a library, complete source code means - all the source code for all modules it contains, plus any associated - interface definition files, plus the scripts used to control compilation - and installation of the library. - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of - running a program using the Library is not restricted, and output from - such a program is covered only if its contents constitute a work based - on the Library (independent of the use of the Library in a tool for - writing it). Whether that is true depends on what the Library does - and what the program that uses the Library does. - -1. You may copy and distribute verbatim copies of the Library's - complete source code as you receive it, in any medium, provided that - you conspicuously and appropriately publish on each copy an - appropriate copyright notice and disclaimer of warranty; keep intact - all the notices that refer to this License and to the absence of any - warranty; and distribute a copy of this License along with the - Library. - - You may charge a fee for the physical act of transferring a copy, - and you may at your option offer warranty protection in exchange for a - fee. - -2. You may modify your copy or copies of the Library or any portion - of it, thus forming a work based on the Library, and copy and - distribute such modifications or work under the terms of Section 1 - above, provided that you also meet all of these conditions: - - 1. The modified work must itself be a software library. - - 2. You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - 3. You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - 4. If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Library, - and can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based - on the Library, the distribution of the whole must be on the terms of - this License, whose permissions for other licensees extend to the - entire whole, and thus to each and every part regardless of who wrote - it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Library. - - In addition, mere aggregation of another work not based on the Library - with the Library (or with a work based on the Library) on a volume of - a storage or distribution medium does not bring the other work under - the scope of this License. - -3. You may opt to apply the terms of the ordinary GNU General Public - License instead of this License to a given copy of the Library. To do - this, you must alter all the notices that refer to this License, so - that they refer to the ordinary GNU General Public License, version 2, - instead of to this License. (If a newer version than version 2 of the - ordinary GNU General Public License has appeared, then you can specify - that version instead if you wish.) Do not make any other change in - these notices. - - Once this change is made in a given copy, it is irreversible for - that copy, so the ordinary GNU General Public License applies to all - subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of - the Library into a program that is not a library. - -4. You may copy and distribute the Library (or a portion or - derivative of it, under Section 2) in object code or executable form - under the terms of Sections 1 and 2 above provided that you accompany - it with the complete corresponding machine-readable source code, which - must be distributed under the terms of Sections 1 and 2 above on a - medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy - from a designated place, then offering equivalent access to copy the - source code from the same place satisfies the requirement to - distribute the source code, even though third parties are not - compelled to copy the source along with the object code. - -5. A program that contains no derivative of any portion of the - Library, but is designed to work with the Library by being compiled or - linked with it, is called a "work that uses the Library". Such a - work, in isolation, is not a derivative work of the Library, and - therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library - creates an executable that is a derivative of the Library (because it - contains portions of the Library), rather than a "work that uses the - library". The executable is therefore covered by this License. - Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file - that is part of the Library, the object code for the work may be a - derivative work of the Library even though the source code is not. - Whether this is true is especially significant if the work can be - linked without the Library, or if the work is itself a library. The - threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data - structure layouts and accessors, and small macros and small inline - functions (ten lines or less in length), then the use of the object - file is unrestricted, regardless of whether it is legally a derivative - work. (Executables containing this object code plus portions of the - Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may - distribute the object code for the work under the terms of Section 6. - Any executables containing that work also fall under Section 6, - whether or not they are linked directly with the Library itself. - -6. As an exception to the Sections above, you may also combine or - link a "work that uses the Library" with the Library to produce a - work containing portions of the Library, and distribute that work - under terms of your choice, provided that the terms permit - modification of the work for the customer's own use and reverse - engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the - Library is used in it and that the Library and its use are covered by - this License. You must supply a copy of this License. If the work - during execution displays copyright notices, you must include the - copyright notice for the Library among them, as well as a reference - directing the user to the copy of this License. Also, you must do one - of these things: - - 1. Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - 2. Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - 3. Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - 4. If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - 5. Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the - Library" must include any data and utility programs needed for - reproducing the executable from it. However, as a special exception, - the materials to be distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies - the executable. - - It may happen that this requirement contradicts the license - restrictions of other proprietary libraries that do not normally - accompany the operating system. Such a contradiction means you cannot - use both them and the Library together in an executable that you - distribute. - -7. You may place library facilities that are a work based on the - Library side-by-side in a single library together with other library - facilities not covered by this License, and distribute such a combined - library, provided that the separate distribution of the work based on - the Library and of the other library facilities is otherwise - permitted, and provided that you do these two things: - - 1. Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - 2. Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - -8. You may not copy, modify, sublicense, link with, or distribute - the Library except as expressly provided under this License. Any - attempt otherwise to copy, modify, sublicense, link with, or - distribute the Library is void, and will automatically terminate your - rights under this License. However, parties who have received copies, - or rights, from you under this License will not have their licenses - terminated so long as such parties remain in full compliance. - -9. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Library or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Library (or any work based on the - Library), you indicate your acceptance of this License to do so, and - all its terms and conditions for copying, distributing or modifying - the Library or works based on it. - -10. Each time you redistribute the Library (or any work based on the - Library), the recipient automatically receives a license from the - original licensor to copy, distribute, link with or modify the Library - subject to these terms and conditions. You may not impose any further - restrictions on the recipients' exercise of the rights granted herein. - You are not responsible for enforcing compliance by third parties with - this License. - -11. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot - distribute so as to satisfy simultaneously your obligations under this - License and any other pertinent obligations, then as a consequence you - may not distribute the Library at all. For example, if a patent - license would not permit royalty-free redistribution of the Library by - all those who receive copies directly or indirectly through you, then - the only way you could satisfy both it and this License would be to - refrain entirely from distribution of the Library. - - If any portion of this section is held invalid or unenforceable under any - particular circumstance, the balance of the section is intended to apply, - and the section as a whole is intended to apply in other circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system which is - implemented by public license practices. Many people have made - generous contributions to the wide range of software distributed - through that system in reliance on consistent application of that - system; it is up to the author/donor to decide if he or she is willing - to distribute software through any other system and a licensee cannot - impose that choice. - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. - -12. If the distribution and/or use of the Library is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Library under this License may add - an explicit geographical distribution limitation excluding those countries, - so that distribution is permitted only in or among countries not thus - excluded. In such case, this License incorporates the limitation as if - written in the body of this License. - -13. The Free Software Foundation may publish revised and/or new - versions of the Lesser General Public License from time to time. - Such new versions will be similar in spirit to the present version, - but may differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the Library - specifies a version number of this License which applies to it and - "any later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Library does not specify a - license version number, you may choose any version ever published by - the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free - programs whose distribution conditions are incompatible with these, - write to the author to ask for permission. For software which is - copyrighted by the Free Software Foundation, write to the Free - Software Foundation; we sometimes make exceptions for this. Our - decision will be guided by the two goals of preserving the free status - of all derivatives of our free software and of promoting the sharing - and reuse of software generally. - - **NO** **WARRANTY** - -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY - KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE - LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME - THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU - FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR - CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE - LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING - RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A - FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF - SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - -### END OF TERMS AND CONDITIONS - -### How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - -@section occt_lgpl_exception OPEN CASCADE EXCEPTION - -### Open CASCADE Exception (version 1.0) to GNU LGPL version 2.1. - -The object code (i.e. not a source) form of a "work that uses the Library" -can incorporate material from a header file that is part of the Library. -As a special exception to the GNU Lesser General Public License version 2.1, -you may distribute such object code incorporating material from header files -provided with the Open CASCADE Technology libraries (including code of CDL -generic classes) under terms of your choice, provided that you give -prominent notice in supporting documentation to this code that it makes use -of or is based on facilities provided by the Open CASCADE Technology software. diff --git a/dox/user_guides/ocaf/ocaf.md b/dox/user_guides/ocaf/ocaf.md index c3e66c9d9a..60c81177b6 100644 --- a/dox/user_guides/ocaf/ocaf.md +++ b/dox/user_guides/ocaf/ocaf.md @@ -592,7 +592,7 @@ The attribute *TDataStd_UAttribute* with the chosen unique GUID identifies the d Standard documents offer ready-to-use documents containing a TDF-based data framework. Each document can contain only one framework. -The documents themselves are contained in the instantiation of a class inheriting from *TDocStd_Application*. This application manages the creation, storage and retrieval of documents. +The documents themselves are contained in the instantiation of a class *TDocStd_Application* (or its descendant). This application manages the creation, storage and retrieval of documents. You can implement undo and redo in your document, and refer from the data framework of one document to that of another one. This is done by means of external link attributes, which store the path and the entry of external links. @@ -605,17 +605,15 @@ To sum up, standard documents alone provide access to the data framework. They a @subsection occt_ocaf_4_2 The Application -As a container for your data framework, you need a document, and your document must be contained in your application. This application will be a class inheriting from *TDocStd_Application*. +As a container for your data framework, you need a document, and your document must be contained in your application. This application will be a class *TDocStd_Application* or a class inheriting from it. @subsubsection occt_ocaf_4_2_1 Creating an application To create an application, use the following syntax. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} -Handle(TDocStd_Application) app -= new MyApplication_Application (); +Handle(TDocStd_Application) app = new TDocStd_Application (); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Note that *MyApplication_Application* is a class, which you have to create and which will inherit from *TDocStd_Application*. @subsubsection occt_ocaf_4_2_2 Creating a new document @@ -626,13 +624,16 @@ Handle(TDocStd_Document) doc; app->NewDocument("NewDocumentFormat", doc); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Here "NewDocumentFormat" is identifier of the format of your document. +OCCT defines several standard formats, distinguishing by a set of OCAF attributes supported, and method of encoding (e.g. binary data or XML), described below. +If your application defines specific OCAF attributes, you need to define your own format for it. + @subsubsection occt_ocaf_4_2_3 Retrieving the application to which the document belongs To retrieve the application containing your document, you use the syntax below. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} -app = Handle(TDocStd_Application)::DownCast -(doc->Application()); +app = Handle(TDocStd_Application)::DownCast (doc->Application()); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @subsection occt_ocaf_4_3 The Document @@ -652,36 +653,96 @@ To retrieve the document from a label in its data framework, you use *TDocStd_Do doc = TDocStd_Document::Get(label); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@subsubsection occt_ocaf_4_3_3 Saving the document +@subsubsection occt_ocaf_4_3_format Defining storage format -If in your document you use only standard attributes (from the packages *TDF, TDataStd, TNaming, TFunction, TPrsStd* and *TDocStd*), you just do the following steps: +OCAF uses customizable mechanism for storage of the documents. +In order to use OCAF persistence to save and read your documents to / from the file, you need to define one or several formats in your application. -* In your application class (which inherits class *TDocStd_Application*) implement two methods: - + Formats (TColStd_SequenceOfExtendedString& theFormats), which append to a given sequence \ your document format string, for example, "NewDocumentFormat" -- this string is also set in the document creation command - + ResourcesName(), which returns a string with a name of resources file (this file contains a description about the extension of the document, storage/retrieval drivers GUIDs...), for example, "NewFormat" -* Create the resource file (with name, for example, "NewFormat") with the following strings: +For that, use method TDocStd_Application::DefineFormat(), for instance: +~~~~~ +app->DefineFormat ("NewDocumentFormat", "New format for OCAF documents", "ndf", + new NewDocumentFormat_RetrievalDriver(), + new NewDocumentFormat_StorageDriver()); +~~~~~ + +Here format "NewDocumentFormat" is defined, with default file extension "ndf", and drivers for reading and storing documents from and to that format are instantiated. +Either of the drivers can be null, in this case corresponding action will not be supported for that format. + +OCAF provides several standard formats, each covering some set of OCAF attributes: + + + + + + + + + + + + + + + + +
FormatPersistent toolkitOCAF attributes covered
Legacy formats (read only)
OCC-StdLite TKStdL TKLCAF
MDTV-Standard TKStd TKLCAF + TKCAF
Binary formats
BinLOcaf TKBinL TKLCAF
BinOcaf TKBin TKLCAF + TKCAF
BinXCAF TKBinXCAF TKLCAF + TKCAF + TKXCAF
TObjBin TKBinTObj TKLCAF + TKTObj
XML formats
XmlLOcaf TKXmlL TKLCAF
XmlOcaf TKXml TKLCAF + TKCAF
XmlXCAF TKXmlXCAF TKLCAF + TKCAF + TKXCAF
TObjXml TKXmlTObj TKLCAF + TKTObj
+ +For convenience, these toolkits provide static methods DefineFormat() accepting handle to application. +These methods allow defining corresponding formats easily, e.g.: ~~~~~ -formatlist:NewDocumentFormat -NewDocumentFormat: New Document Format Version 1.0 +BinDrivers::DefineFormat (app); // define format "BinOcaf" +~~~~~ + +Use these toolkits as example for implementation of persistence drivers for custom attributes, or new persistence formats. + +The application can define several storage formats. +On save, the format specified in the document (see TDocStd_Document::StorageFormat()) will be used (it will fail if that format is not defined in the application). +On reading, format identifier stored in the file is used, and recorded in the document. + +@subsubsection occt_ocaf_4_3_plugins Defining storage format by resource files + +Alternative (legacy, used in earlier versions of OCCT) method to define formats is via usage of resource files. +This method allows loading persistence drivers on demand, using plugin mechanism. + +To use this method, create your own application class inheriting from *TDocStd_Application*, and override method ResourcesName(). +That method should return a string with a name of resource file, e.g. "NewDocumentFormat", which will contain description of the format. + +Then create that resource file and define parameters of your format: + +~~~~~ +ndf.FileFormat: NewDocumentFormat +NewDocumentFormat.Description: New Document Format Version 1.0 NewDocumentFormat.FileExtension: ndf -NewDocumentFormat.StoragePlugin: bd696000-5b34-11d1-b5ba-00a0c9064368 -NewDocumentFormat.RetrievalPlugin: bd696001-5b34-11d1-b5ba-00a0c9064368 -NewDocumentFormatSchema: bd696002-5b34-11d1-b5ba-00a0c9064368 -NewDocumentFormat.AttributeStoragePlugin:57b0b826-d931-11d1-b5da-00a0c9064368 -NewDocumentFormat.AttributeRetrievalPlugin:57b0b827-d931-11d1-b5da-00a0c9064368 +NewDocumentFormat.StoragePlugin: bb5aa176-c65c-4c84-862e-6b7c1fe16921 +NewDocumentFormat.RetrievalPlugin: 76fb4c04-ea9a-46aa-88a2-25f6a228d902 ~~~~~ -* Copy the resource file "Plugin" from $CASROOT/src/StdResource +Here GUIDs should be unique and correspond to the GUIDs supported by relevant plugin. +You can use either one of existing plugins (see the table above) or create your own. -In order to set the paths for these files it is necessary to set the environments: *CSF_PluginDefaults* and *CSF_NewFormatDefaults*. For example, set the files in the directory *MyApplicationPath/MyResources*: +Finally, make a copy of the resource file "Plugin" from $CASROOT/src/StdResource, and, if necessary, add definition of your plugin in it, for instance: + +~~~~~ +bb5aa176-c65c-4c84-862e-6b7c1fe16921.Location: TKNewFormat +76fb4c04-ea9a-46aa-88a2-25f6a228d902.Location: TKNewFormat +~~~~~ + +In order to have these resource files loaded during the program execution, it is necessary to set two environment variables: *CSF_PluginDefaults* and *CSF_NewFormatDefaults*. +For example, set the files in the directory *MyApplicationPath/MyResources*: ~~~~~ setenv CSF_PluginDefaults MyApplicationPath/MyResources setenv CSF_NewFormatDefaults MyApplicationPath/MyResources ~~~~~ -Once these steps are taken you may run your application, create documents and Save/Open them. +@subsubsection occt_ocaf_4_3_3 Saving a document + +To save the document, make sure that its parameter StorageFormat() corresponds to one of formats defined in the application, and use method *TDocStd_Application::SaveAs*, for instance: + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} +app->SaveAs(doc, "/tmp/example.caf"); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @subsubsection occt_ocaf_4_3_4 Opening the document from a file @@ -1700,37 +1761,6 @@ Both the XML format and the XML OCAF persistence code are extensible in the sens * Add (in the new *DocumentStorageDriver*) the *targetNamespace* accompanied with its prefix, using method *XmlDrivers_DocumentStorageDriver::AddNamespace*. The same is done for all namespaces objects which are used by the new persistence, with the exception of the "ocaf" namespace. * Pass (in every OCAF attribute driver) the namespace prefix of the *targetNamespace* to the constructor of *XmlMDF_ADriver*. -@section occt_ocaf_9a Persistent Data Storage - -@subsection occt_ocaf_9a_1 Introduction - -In OCAF, persistence, that is, the mechanism used to save a document in a file, is based on an explicit formal description of the data saved. - -When you open a document, the application reads the corresponding file and first creates a memory representation of it. This representation is then converted to the application data model — the OCAF-based data structure the application operates on. The file's memory representation consists of objects defined by classes known as persistent. - -OCAF includes a ready-to-use schema suitable for most applications. -However, it can be extended if needed. - -Applications using compound documents extensively (saving data in many files linked together) should implement data management services. It is out the scope of OCAF to provide functions such as: -* Version and configuration management of compound documents; -* Querying a referenced document for its referencing documents. - -In order to ease the delegation of document management to a data management application, OCAF encapsulates the file management functions in a driver (the meta-data driver). You have to implement this driver for your application to communicate with the data management system of your choice. - - -@subsection occt_ocaf_9a_2 Schemes of Persistence - -There are three schemes of persistence, which you can use to store and retrieve OCAF data (documents): - - * Standard persistence schema, compatible with previous OCAF applications. This schema is deprecated and supports only reading of standard attributes (no writing). - * XmlOcaf persistence, allowing the storage of all OCAF data in XML form - * BinOcaf persistence, allowing the storage of all OCAF data in binary format form - - -In an OCAF application you can use any persistence schema or -even all three of them. The choice is made depending on the *Format* string of stored OCAF documents -or automatically by the file header data -- on retrieval. - @section occt_ocaf_10 GLOSSARY * **Application** -- a document container holding all documents containing all application data. @@ -1815,116 +1845,21 @@ In C++, the application behavior is implemented in virtual functions redefined i You can also implement the user interface in the Java language using the Swing-based Java Application Desktop component (JAD) provided with OCAF. -@subsection occt_ocaf_11_b An example of OCAF usage - -To create a useful OCAF-based application, it is necessary to redefine two deferred methods: Formats and ResourcesName - -In the Formats method, add the format of the documents, which need to be read by the application and may have been built in other applications. - -For example: - -~~~~ - void myApplication::Formats(TColStd_SequenceOfExtendedString& Formats) - { - Formats.Append(TCollection_ExtendedString ("OCAF-myApplication")); - } -~~~~ - -In the ResourcesName method, you only define the name of the resource file. This -file contains several definitions for the saving and opening mechanisms associated -with each format and calling of the plug-in file. - -~~~~ - Standard_CString myApplication::ResourcesName() - { - return Standard_CString ("Resources"); - } -~~~~ - -To obtain the saving and opening mechanisms, it is necessary to set two environment variables: CSF_PluginDefaults, which defines the path of the plug-in file, and CSF_ResourcesDefault, which defines the resource file: - -~~~~ - SetEnvironmentVariable ( "CSF_ResourcesDefaults",myDirectory); - SetEnvironmentVariable ( "CSF_PluginDefaults",myDirectory); -~~~~ - -The plugin and the resource files of the application will be located in myDirector. -The name of the plugin file must be Plugin. - -### Resource File - -The resource file describes the documents (type and extension) and -the type of data that the application can manipulate -by identifying the storage and retrieval drivers appropriate for this data. - -Each driver is unique and identified by a GUID generated, for example, with the uuidgen tool in Windows. - -Five drivers are required to use all standard attributes provided within OCAF: - - * the schema driver (ad696002-5b34-11d1-b5ba-00a0c9064368) - * the document storage driver (ad696000-5b34-11d1-b5ba-00a0c9064368) - * the document retrieval driver (ad696001-5b34-11d1-b5ba-00a0c9064368) - * the attribute storage driver (47b0b826-d931-11d1-b5da-00a0c9064368) - * the attribute retrieval driver (47b0b827-d931-11d1-b5da-00a0c9064368) - -These drivers are provided as plug-ins and are located in the PappStdPlugin library. - - -For example, this is a resource file, which declares a new model document OCAF-MyApplication: - -~~~~ -formatlist:OCAF-MyApplication -OCAF-MyApplication.Description: MyApplication Document Version 1.0 -OCAF-MyApplication.FileExtension: sta -OCAF-MyApplication.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368 -OCAF-MyApplication.RetrievalPlugin: ad696001-5b34-11d1-b5ba-00a0c9064368 -OCAF-MyApplicationSchema: ad696002-5b34-11d1-b5ba-00a0c9064368 -OCAF-MyApplication.AttributeStoragePlugin: 47b0b826-d931-11d1-b5da-00a0c9064368 -OCAF-MyApplication.AttributeRetrievalPlugin: 47b0b827-d931-11d1-b5da-00a0c9064368 -~~~~ - - -### Plugin File - -The plugin file describes the list of required plug-ins to run the application and the -libraries in which plug-ins are located. - -You need at least the FWOSPlugin and the plug-in drivers to run an OCAF application. - -The syntax of each item is Identification.Location Library_Name, where: -* Identification is GUID. -* Location defines the location of the Identification (where its definition is found). -* Library_Name is the name (and path to) the library, where the plug-in is located. - -For example, this is a Plugin file: - -~~~~ -a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin -! base document drivers plugin -ad696000-5b34-11d1-b5ba-00a0c9064368.Location: PAppStdPlugin -ad696001-5b34-11d1-b5ba-00a0c9064368.Location: PAppStdPlugin -ad696002-5b34-11d1-b5ba-00a0c9064368.Location: PAppStdPlugin -47b0b826-d931-11d1-b5da-00a0c9064368.Location: PAppStdPlugin -47b0b827-d931-11d1-b5da-00a0c9064368.Location: PAppStdPlugin -~~~~ - - - @subsection occt_ocaf_11_1 Implementation of Attribute Transformation in a HXX file ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} -\#include +#include -\#include -\#include -\#include -\#include +#include +#include +#include +#include -//! This attribute implements a transformation data container +// This attribute implements a transformation data container class MyPackage_Transformation : public TDF_Attribute { public: - //!@name Static methods + //!@ name Static methods //! The method returns a unique GUID of this attribute. //! By means of this GUID this attribute may be identified @@ -1935,12 +1870,12 @@ public: //! The found or created attribute is returned. Standard_EXPORT static Handle(MyPackage_Transformation) Set (const TDF_Label theLabel); - //!@name Methods for access to the attribute data + //!@ name Methods for access to the attribute data //! The method returns the transformation. Standard_EXPORT gp_Trsf Get () const; - //!@name Methods for setting the data of transformation + //!@ name Methods for setting the data of transformation //! The method defines a rotation type of transformation. Standard_EXPORT void SetRotation (const gp_Ax1& theAxis, Standard_Real theAngle); @@ -1963,7 +1898,7 @@ public: //! The method defines a complex type of transformation from one co-ordinate system to another. Standard_EXPORT void SetTransformation (const gp_Ax3& theCoordinateSystem1, const gp_Ax3& theCoordinateSystem2); - //!@name Overridden methods from TDF_Attribute + //!@ name Overridden methods from TDF_Attribute //! The method returns a unique GUID of the attribute. //! By means of this GUID this attribute may be identified among other attributes attached to the same label. @@ -1984,7 +1919,7 @@ public: //! Prints the content of this attribute into the stream. Standard_EXPORT Standard_OStream& Dump(Standard_OStream& theOS); - //!@name Constructor + //!@ name Constructor //! The C++ constructor of this atribute class. //! Usually it is never called outside this class. @@ -2012,7 +1947,7 @@ private: @subsection occt_ocaf_11_2 Implementation of Attribute Transformation in a CPP file ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} -\#include +#include //======================================================================= //function : GetID diff --git a/samples/mfc/occtdemo/All/All.dsp b/samples/mfc/occtdemo/All/All.dsp deleted file mode 100755 index 7c3b65d777..0000000000 --- a/samples/mfc/occtdemo/All/All.dsp +++ /dev/null @@ -1,63 +0,0 @@ -# Microsoft Developer Studio Project File - Name="All" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Generic Project" 0x010a - -CFG=All - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "All.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "All.mak" CFG="All - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "All - Win32 Release" (based on "Win32 (x86) Generic Project") -!MESSAGE "All - Win32 Debug" (based on "Win32 (x86) Generic Project") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -MTL=midl.exe - -!IF "$(CFG)" == "All - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "All - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "All - Win32 Release" -# Name "All - Win32 Debug" -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Approx/Approx.dsp b/samples/mfc/occtdemo/Approx/Approx.dsp deleted file mode 100755 index 72fd2b3c85..0000000000 --- a/samples/mfc/occtdemo/Approx/Approx.dsp +++ /dev/null @@ -1,232 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Approx" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Approx - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Approx.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Approx.mak" CFG="Approx - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Approx - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Approx - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Approx - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Approx - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Approx - Win32 Release" -# Name "Approx - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Approx_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Approx_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# Begin Source File - -SOURCE=..\Common\WNT\res\occ_logo.bmp -# End Source File -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Approx/Approx.vcproj b/samples/mfc/occtdemo/Approx/Approx.vcproj index 2eb750c020..feb981d4a5 100755 --- a/samples/mfc/occtdemo/Approx/Approx.vcproj +++ b/samples/mfc/occtdemo/Approx/Approx.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Chamfers - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Chamfers.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Chamfers.mak" CFG="Chamfers - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Chamfers - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Chamfers - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Chamfers - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Chamfers - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Chamfers - Win32 Release" -# Name "Chamfers - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Chamfers_Presentation.cpp - -!IF "$(CFG)" == "Chamfers - Win32 Release" - -!ELSEIF "$(CFG)" == "Chamfers - Win32 Debug" - -# ADD CPP /W3 - -!ENDIF - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Chamfers_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Chamfers/Chamfers.vcproj b/samples/mfc/occtdemo/Chamfers/Chamfers.vcproj index fa7af64894..f83570449a 100755 --- a/samples/mfc/occtdemo/Chamfers/Chamfers.vcproj +++ b/samples/mfc/occtdemo/Chamfers/Chamfers.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Convert - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Convert.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Convert.mak" CFG="Convert - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Convert - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Convert - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Convert - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Convert - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Convert - Win32 Release" -# Name "Convert - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Convert_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Convert_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Convert/Convert.vcproj b/samples/mfc/occtdemo/Convert/Convert.vcproj index 5986a4d7b3..d8b7ce7f61 100755 --- a/samples/mfc/occtdemo/Convert/Convert.vcproj +++ b/samples/mfc/occtdemo/Convert/Convert.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=DCA - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "DCA.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "DCA.mak" CFG="DCA - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "DCA - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "DCA - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "DCA - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "DCA - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /u /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "DCA - Win32 Release" -# Name "DCA - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\DCA_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\DCA_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/DCA/DCA.vcproj b/samples/mfc/occtdemo/DCA/DCA.vcproj index be269b273b..59c333b8f9 100755 --- a/samples/mfc/occtdemo/DCA/DCA.vcproj +++ b/samples/mfc/occtdemo/DCA/DCA.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Extrema - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Extrema.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Extrema.mak" CFG="Extrema - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Extrema - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Extrema - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Extrema - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Extrema - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Extrema - Win32 Release" -# Name "Extrema - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Extrema_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Extrema_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Extrema/Extrema.vcproj b/samples/mfc/occtdemo/Extrema/Extrema.vcproj index 5525454d17..86601998b4 100755 --- a/samples/mfc/occtdemo/Extrema/Extrema.vcproj +++ b/samples/mfc/occtdemo/Extrema/Extrema.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=GProps - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "GProps.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "GProps.mak" CFG="GProps - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "GProps - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "GProps - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "GProps - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "GProps - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "GProps - Win32 Release" -# Name "GProps - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\GProps_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\GProps_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/GProps/GProps.vcproj b/samples/mfc/occtdemo/GProps/GProps.vcproj index 8f8b0b1eef..d9c5087978 100755 --- a/samples/mfc/occtdemo/GProps/GProps.vcproj +++ b/samples/mfc/occtdemo/GProps/GProps.vcproj @@ -43,7 +43,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=GeomConstraints - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "GeomConstraints.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "GeomConstraints.mak" CFG="GeomConstraints - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "GeomConstraints - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "GeomConstraints - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "GeomConstraints - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /FR /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "GeomConstraints - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "WNT" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "GeomConstraints - Win32 Release" -# Name "GeomConstraints - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\GeomConstraints_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\GeomConstraints_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/GeomConstraints/GeomConstraints.vcproj b/samples/mfc/occtdemo/GeomConstraints/GeomConstraints.vcproj index 5a881e8e5b..eb67d3ea29 100755 --- a/samples/mfc/occtdemo/GeomConstraints/GeomConstraints.vcproj +++ b/samples/mfc/occtdemo/GeomConstraints/GeomConstraints.vcproj @@ -42,7 +42,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Glue - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Glue.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Glue.mak" CFG="Glue - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Glue - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Glue - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Glue - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Glue - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Glue - Win32 Release" -# Name "Glue - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Glue_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Glue_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Glue/Glue.vcproj b/samples/mfc/occtdemo/Glue/Glue.vcproj index 23a308882d..d106206395 100755 --- a/samples/mfc/occtdemo/Glue/Glue.vcproj +++ b/samples/mfc/occtdemo/Glue/Glue.vcproj @@ -43,7 +43,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=HLR - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "HLR.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "HLR.mak" CFG="HLR - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "HLR - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "HLR - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "HLR - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "HLR - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "HLR - Win32 Release" -# Name "HLR - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\HLR_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\HLR_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/HLR/HLR.vcproj b/samples/mfc/occtdemo/HLR/HLR.vcproj index c11751f809..cfb013925b 100755 --- a/samples/mfc/occtdemo/HLR/HLR.vcproj +++ b/samples/mfc/occtdemo/HLR/HLR.vcproj @@ -43,7 +43,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Interpol - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Interpol.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Interpol.mak" CFG="Interpol - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Interpol - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Interpol - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Interpol - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Interpol - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "WNT" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Interpol - Win32 Release" -# Name "Interpol - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Interpol_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Interpol_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Interpol/Interpol.vcproj b/samples/mfc/occtdemo/Interpol/Interpol.vcproj index b12a8a3739..91df9578ad 100755 --- a/samples/mfc/occtdemo/Interpol/Interpol.vcproj +++ b/samples/mfc/occtdemo/Interpol/Interpol.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Intersections - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Intersections.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Intersections.mak" CFG="Intersections - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Intersections - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Intersections - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Intersections - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Intersections - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Intersections - Win32 Release" -# Name "Intersections - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Intersections_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Intersections_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Intersections/Intersections.vcproj b/samples/mfc/occtdemo/Intersections/Intersections.vcproj index 7e19c97d0b..19adaf07b7 100755 --- a/samples/mfc/occtdemo/Intersections/Intersections.vcproj +++ b/samples/mfc/occtdemo/Intersections/Intersections.vcproj @@ -42,7 +42,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=LProps - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "LProps.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "LProps.mak" CFG="LProps - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "LProps - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "LProps - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "LProps - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "LProps - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "LProps - Win32 Release" -# Name "LProps - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\LProps_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\LProps_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/LProps/LProps.vcproj b/samples/mfc/occtdemo/LProps/LProps.vcproj index 512bc0df1c..80b7b33978 100755 --- a/samples/mfc/occtdemo/LProps/LProps.vcproj +++ b/samples/mfc/occtdemo/LProps/LProps.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Approx - End Project Dependency - Begin Project Dependency - Project_Dep_Name Chamfers - End Project Dependency - Begin Project Dependency - Project_Dep_Name Convert - End Project Dependency - Begin Project Dependency - Project_Dep_Name DCA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Extrema - End Project Dependency - Begin Project Dependency - Project_Dep_Name GeomConstraints - End Project Dependency - Begin Project Dependency - Project_Dep_Name Glue - End Project Dependency - Begin Project Dependency - Project_Dep_Name GProps - End Project Dependency - Begin Project Dependency - Project_Dep_Name HLR - End Project Dependency - Begin Project Dependency - Project_Dep_Name Interpol - End Project Dependency - Begin Project Dependency - Project_Dep_Name Intersections - End Project Dependency - Begin Project Dependency - Project_Dep_Name LProps - End Project Dependency - Begin Project Dependency - Project_Dep_Name Offset2d - End Project Dependency - Begin Project Dependency - Project_Dep_Name PointOnCurve - End Project Dependency - Begin Project Dependency - Project_Dep_Name Primitives - End Project Dependency - Begin Project Dependency - Project_Dep_Name Projection - End Project Dependency - Begin Project Dependency - Project_Dep_Name Simplify - End Project Dependency - Begin Project Dependency - Project_Dep_Name SplitShape - End Project Dependency - Begin Project Dependency - Project_Dep_Name Sweep - End Project Dependency - Begin Project Dependency - Project_Dep_Name Tesselate - End Project Dependency - Begin Project Dependency - Project_Dep_Name TexturesExt - End Project Dependency - Begin Project Dependency - Project_Dep_Name ThruSections - End Project Dependency - Begin Project Dependency - Project_Dep_Name Transform - End Project Dependency - Begin Project Dependency - Project_Dep_Name Validate - End Project Dependency -}}} - -############################################################################### - -Project: "Approx"=.\Approx\Approx.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Chamfers"=.\Chamfers\Chamfers.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Convert"=.\Convert\Convert.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "DCA"=.\DCA\DCA.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Extrema"=.\Extrema\Extrema.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "GProps"=.\GProps\GProps.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "GeomConstraints"=.\GeomConstraints\GeomConstraints.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Glue"=.\Glue\Glue.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "HLR"=.\HLR\HLR.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Interpol"=.\Interpol\Interpol.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Intersections"=.\Intersections\Intersections.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "LProps"=.\LProps\LProps.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Offset2d"=.\Offset2d\Offset2d.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "PointOnCurve"=.\PointOnCurve\PointOnCurve.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Primitives"=.\Primitives\Primitives.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Projection"=.\Projection\Projection.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Simplify"=.\Simplify\Simplify.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "SplitShape"=.\SplitShape\SplitShape.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Sweep"=.\Sweep\Sweep.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Tesselate"=.\Tesselate\Tesselate.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "TexturesExt"=.\TexturesExt\TexturesExt.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ThruSections"=.\ThruSections\ThruSections.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Transform"=.\Transform\Transform.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Validate"=.\Validate\Validate.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/samples/mfc/occtdemo/Offset2d/Offset2d.dsp b/samples/mfc/occtdemo/Offset2d/Offset2d.dsp deleted file mode 100755 index edbae4f72d..0000000000 --- a/samples/mfc/occtdemo/Offset2d/Offset2d.dsp +++ /dev/null @@ -1,229 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Offset2d" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Offset2d - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Offset2d.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Offset2d.mak" CFG="Offset2d - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Offset2d - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Offset2d - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Offset2d - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Offset2d - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Offset2d - Win32 Release" -# Name "Offset2d - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Offset2d_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Offset2d_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Offset2d/Offset2d.vcproj b/samples/mfc/occtdemo/Offset2d/Offset2d.vcproj index e40992e78d..d589c366b4 100755 --- a/samples/mfc/occtdemo/Offset2d/Offset2d.vcproj +++ b/samples/mfc/occtdemo/Offset2d/Offset2d.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=PointOnCurve - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "PointOnCurve.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "PointOnCurve.mak" CFG="PointOnCurve - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "PointOnCurve - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "PointOnCurve - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "PointOnCurve - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "PointOnCurve - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "PointOnCurve - Win32 Release" -# Name "PointOnCurve - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\PointOnCurve_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\PointOnCurve_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/PointOnCurve/PointOnCurve.vcproj b/samples/mfc/occtdemo/PointOnCurve/PointOnCurve.vcproj index 923b9a8d38..90dbc08535 100755 --- a/samples/mfc/occtdemo/PointOnCurve/PointOnCurve.vcproj +++ b/samples/mfc/occtdemo/PointOnCurve/PointOnCurve.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Primitives - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Primitives.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Primitives.mak" CFG="Primitives - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Primitives - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Primitives - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Primitives - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Primitives - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Primitives - Win32 Release" -# Name "Primitives - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Primitives_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Primitives_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Primitives/Primitives.vcproj b/samples/mfc/occtdemo/Primitives/Primitives.vcproj index f2c5add4d8..fdf4ee2b51 100755 --- a/samples/mfc/occtdemo/Primitives/Primitives.vcproj +++ b/samples/mfc/occtdemo/Primitives/Primitives.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Projection - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Projection.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Projection.mak" CFG="Projection - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Projection - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Projection - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Projection - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Projection - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "WNT" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Projection - Win32 Release" -# Name "Projection - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Projection_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Projection_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Projection/Projection.vcproj b/samples/mfc/occtdemo/Projection/Projection.vcproj index 1afe979bb0..33598aa0da 100755 --- a/samples/mfc/occtdemo/Projection/Projection.vcproj +++ b/samples/mfc/occtdemo/Projection/Projection.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Simplify - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Simplify.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Simplify.mak" CFG="Simplify - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Simplify - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Simplify - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Simplify - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /FR /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 TKSHHealing.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Simplify - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "WNT" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TKSHHealing.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Simplify - Win32 Release" -# Name "Simplify - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Simplify_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Simplify_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Simplify/Simplify.vcproj b/samples/mfc/occtdemo/Simplify/Simplify.vcproj index 1a627fda4e..d97f3f60c5 100755 --- a/samples/mfc/occtdemo/Simplify/Simplify.vcproj +++ b/samples/mfc/occtdemo/Simplify/Simplify.vcproj @@ -42,7 +42,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=SplitShape - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "SplitShape.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SplitShape.mak" CFG="SplitShape - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SplitShape - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "SplitShape - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SplitShape - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "SplitShape - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "SplitShape - Win32 Release" -# Name "SplitShape - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\SplitShape_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\SplitShape_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/SplitShape/SplitShape.vcproj b/samples/mfc/occtdemo/SplitShape/SplitShape.vcproj index 4e71de1532..bd07d15063 100755 --- a/samples/mfc/occtdemo/SplitShape/SplitShape.vcproj +++ b/samples/mfc/occtdemo/SplitShape/SplitShape.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Sweep - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Sweep.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Sweep.mak" CFG="Sweep - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Sweep - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Sweep - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Sweep - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Sweep - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Sweep - Win32 Release" -# Name "Sweep - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Sweep_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Sweep_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Sweep/Sweep.vcproj b/samples/mfc/occtdemo/Sweep/Sweep.vcproj index f2932eb1f6..137298eff2 100755 --- a/samples/mfc/occtdemo/Sweep/Sweep.vcproj +++ b/samples/mfc/occtdemo/Sweep/Sweep.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Tesselate - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Tesselate.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Tesselate.mak" CFG="Tesselate - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Tesselate - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Tesselate - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Tesselate - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Tesselate - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Tesselate - Win32 Release" -# Name "Tesselate - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Tesselate_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Tesselate_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Tesselate/Tesselate.vcproj b/samples/mfc/occtdemo/Tesselate/Tesselate.vcproj index d9f2e18da7..e0091093c1 100755 --- a/samples/mfc/occtdemo/Tesselate/Tesselate.vcproj +++ b/samples/mfc/occtdemo/Tesselate/Tesselate.vcproj @@ -42,7 +42,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Textures - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Textures.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Textures.mak" CFG="Textures - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Textures - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Textures - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Textures - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Textures - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Textures - Win32 Release" -# Name "Textures - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Textures_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Textures_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Textures/Textures.vcproj b/samples/mfc/occtdemo/Textures/Textures.vcproj index f9a87b2338..3fffbdeea0 100755 --- a/samples/mfc/occtdemo/Textures/Textures.vcproj +++ b/samples/mfc/occtdemo/Textures/Textures.vcproj @@ -43,7 +43,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=TexturesExt - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TexturesExt.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TexturesExt.mak" CFG="TexturesExt - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TexturesExt - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "TexturesExt - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TexturesExt - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "TexturesExt - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "TexturesExt - Win32 Release" -# Name "TexturesExt - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\TexturesExt_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\TexturesExt_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/TexturesExt/TexturesExt.vcproj b/samples/mfc/occtdemo/TexturesExt/TexturesExt.vcproj index b6f7d15273..edb0989a0b 100755 --- a/samples/mfc/occtdemo/TexturesExt/TexturesExt.vcproj +++ b/samples/mfc/occtdemo/TexturesExt/TexturesExt.vcproj @@ -43,7 +43,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=ThruSections - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ThruSections.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ThruSections.mak" CFG="ThruSections - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ThruSections - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "ThruSections - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ThruSections - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "ThruSections - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "ThruSections - Win32 Release" -# Name "ThruSections - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ThruSections_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ThruSections_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/ThruSections/ThruSections.vcproj b/samples/mfc/occtdemo/ThruSections/ThruSections.vcproj index 1d91514066..da85bf9f69 100755 --- a/samples/mfc/occtdemo/ThruSections/ThruSections.vcproj +++ b/samples/mfc/occtdemo/ThruSections/ThruSections.vcproj @@ -42,7 +42,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=TopLProps - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TopLProps.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TopLProps.mak" CFG="TopLProps - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TopLProps - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "TopLProps - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TopLProps - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "TopLProps - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "TopLProps - Win32 Release" -# Name "TopLProps - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\TopLProps_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\TopLProps_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/TopLProps/TopLProps.vcproj b/samples/mfc/occtdemo/TopLProps/TopLProps.vcproj index b963e8f80e..c1c04f6d7b 100755 --- a/samples/mfc/occtdemo/TopLProps/TopLProps.vcproj +++ b/samples/mfc/occtdemo/TopLProps/TopLProps.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Transform - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Transform.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Transform.mak" CFG="Transform - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Transform - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Transform - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Transform - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Transform - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /Fr /YX"StdAfx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Transform - Win32 Release" -# Name "Transform - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Transform_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Transform_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\env.bat -# End Source File -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\run.bat -# End Source File -# Begin Source File - -SOURCE=..\vc.bat -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Transform/Transform.vcproj b/samples/mfc/occtdemo/Transform/Transform.vcproj index 340f99981c..0366a9bd80 100755 --- a/samples/mfc/occtdemo/Transform/Transform.vcproj +++ b/samples/mfc/occtdemo/Transform/Transform.vcproj @@ -43,7 +43,7 @@ Name="VCCustomBuildTool"/> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Validate - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Validate.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Validate.mak" CFG="Validate - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Validate - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Validate - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Validate - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../Release" -# PROP Intermediate_Dir "../Release/obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "Validate - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../Debug" -# PROP Intermediate_Dir "../Debug/objd" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../" /I "../Common" /I "../Common/WNT" /I "../Common/ISession" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "WNT" /D "_AFXDLL" /YX"StdAfx.h" /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKDraw.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib TKBO.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Validate - Win32 Release" -# Name "Validate - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Validate_Presentation.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Validate_Presentation.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Group "Source Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.rc -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.cpp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.cpp -# End Source File -# End Group -# Begin Group "Header Files No. 1" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\ISession\ISession_Curve.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemo.h -# End Source File -# Begin Source File - -SOURCE=..\Common\OCCDemo_Presentation.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoDoc.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\OCCDemoView.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\resource.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\ResultDialog.h -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.ico -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\OCCDemo.rc2 -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar.bmp -# End Source File -# Begin Source File - -SOURCE=..\Common\WNT\res\toolbar1.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# End Group -# End Target -# End Project diff --git a/samples/mfc/occtdemo/Validate/Validate.vcproj b/samples/mfc/occtdemo/Validate/Validate.vcproj index 3c9eabfb4c..13694f9464 100755 --- a/samples/mfc/occtdemo/Validate/Validate.vcproj +++ b/samples/mfc/occtdemo/Validate/Validate.vcproj @@ -40,7 +40,7 @@ Name="VCCustomBuildTool"/> 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Geometry.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -155,7 +155,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Geometry.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -198,7 +198,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Geometry.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -242,7 +242,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc10\bind/Geometry.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj index dc004c39c6..12b31f9c87 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Geometry.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -159,7 +159,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Geometry.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Geometry.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc11\bind/Geometry.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj index f68cd3bf75..5970f5fa85 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Geometry.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -159,7 +159,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Geometry.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Geometry.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc12\bind/Geometry.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj index 24169cc6ce..cb87a2837d 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Modeling.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -153,7 +153,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Modeling.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -196,7 +196,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Modeling.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -238,7 +238,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Modeling.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj index a1945d3914..38a12d72f2 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Modeling.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Modeling.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Modeling.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -242,7 +242,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Modeling.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj index 068d46635a..150758ec43 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Modeling.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Modeling.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Modeling.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -242,7 +242,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Modeling.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj index dadcb34fbc..fe27e0b5c2 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj @@ -80,7 +80,7 @@ /> 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Viewer2d.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Viewer2d.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Viewer2d.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Viewer2d.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj index 0de25b325d..1b7940c0fa 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Viewer2d.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Viewer2d.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Viewer2d.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Viewer2d.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj index c94778f69f..e85f0b4c71 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Viewer2d.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Viewer2d.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Viewer2d.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Viewer2d.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj index 40d378e3a0..bb89855f95 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Viewer3d.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Viewer3d.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -196,7 +196,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Viewer3d.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -239,7 +239,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Viewer3d.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj index 3226305105..3aa966b477 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Viewer3d.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Viewer3d.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Viewer3d.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Viewer3d.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj index e4126bf574..af8482271e 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Viewer3d.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Viewer3d.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Viewer3d.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Viewer3d.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj index eabc38cbae..070b4d9da6 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/ImportExport.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/ImportExport.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/ImportExport.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/ImportExport.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj index 7a2f943f95..27a6dc3759 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/ImportExport.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/ImportExport.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/ImportExport.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/ImportExport.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj index 14870c85e9..a8acacde31 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/ImportExport.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/ImportExport.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/ImportExport.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/ImportExport.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj index 564ddcde5d..06c0db641b 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Ocaf.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Ocaf.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Ocaf.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Ocaf.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj index 0b1dc56c33..c86b518550 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Ocaf.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Ocaf.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Ocaf.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Ocaf.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj index a59c52c170..49b6238c9b 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Ocaf.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Ocaf.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Ocaf.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Ocaf.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj index c35564b43c..5e62cd13c8 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Triangulation.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Triangulation.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Triangulation.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Triangulation.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj index 5a72c65286..173fc13b2c 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Triangulation.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Triangulation.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Triangulation.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Triangulation.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj index 7574519635..988878a8d1 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Triangulation.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Triangulation.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Triangulation.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Triangulation.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj index 89cf7adf1c..d894259f55 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/HLR.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/HLR.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/HLR.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/HLR.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj index a3aec284b6..b90053b4d7 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/HLR.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/HLR.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/HLR.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/HLR.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj index dea20be5c5..b6fe2000b2 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/HLR.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/HLR.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/HLR.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/HLR.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj index d674241ae3..f7f0d7d6e9 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Animation.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -153,7 +153,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Animation.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -196,7 +196,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Animation.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -239,7 +239,7 @@ true - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Animation.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj index 8a9618d75a..4160046ed8 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Animation.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Animation.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Animation.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ true - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Animation.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj index 4242755d9b..3b89b6a38e 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Animation.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Animation.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Animation.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ true - TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Animation.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj index c4919392c9..f6bac08dee 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj @@ -80,7 +80,7 @@ /> 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Convert.exe true ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Convert.exe true ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Convert.exe true ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Convert.exe true ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj index 1ac7aa285d..648836a036 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj @@ -117,7 +117,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Convert.exe true ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -162,7 +162,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Convert.exe true ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -206,7 +206,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Convert.exe true ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -250,7 +250,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Convert.exe true ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj index 7f5ee9adf7..99412189f6 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj @@ -117,7 +117,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Convert.exe true ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -162,7 +162,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Convert.exe true ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -206,7 +206,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Convert.exe true ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -250,7 +250,7 @@ 0x0409 - TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Convert.exe true ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj index 761df2ee20..bdec0b9b68 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/mfcsample.dll true $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/mfcsample.dll true $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 21a553a569..f688c8dfa2 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/mfcsample.dll true $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/mfcsample.dll true $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index 8906540287..e8d07002f5 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/mfcsample.dll true $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/mfcsample.dll true $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index 080a4f609b..c99909ca2a 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -80,7 +80,7 @@ /> -#include -#include -#include IMPLEMENT_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application) -//======================================================================= -//function : AppStd_Application -//purpose : -//======================================================================= -AppStd_Application::AppStd_Application() -{ - myMessageDriver = new CDM_COutMessageDriver; -} - -//======================================================================= -//function : MessageDriver -//purpose : -//======================================================================= - -Handle(CDM_MessageDriver) AppStd_Application::MessageDriver () -{ - return myMessageDriver; -} - -//======================================================================= -//function : Formats -//purpose : -//======================================================================= -void AppStd_Application::Formats(TColStd_SequenceOfExtendedString& theFormats) -{ - theFormats.Append("XmlOcaf"); - theFormats.Append("BinOcaf"); -} - //======================================================================= //function : ResourcesName //purpose : diff --git a/src/AppStd/AppStd_Application.hxx b/src/AppStd/AppStd_Application.hxx index 7c09ba9e98..08196a7c4f 100644 --- a/src/AppStd/AppStd_Application.hxx +++ b/src/AppStd/AppStd_Application.hxx @@ -28,46 +28,15 @@ class CDM_MessageDriver; class AppStd_Application; DEFINE_STANDARD_HANDLE(AppStd_Application, TDocStd_Application) - +//! Legacy class defining resources name for standard OCAF documents class AppStd_Application : public TDocStd_Application { - -public: - - - Standard_EXPORT AppStd_Application(); - - Standard_EXPORT virtual Handle(CDM_MessageDriver) MessageDriver() Standard_OVERRIDE; - - //! returns supported format for application documents. - Standard_EXPORT virtual void Formats (TColStd_SequenceOfExtendedString& theFormats) Standard_OVERRIDE; - +public: //! returns the file name which contains application //! resources Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; - - - DEFINE_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application) - -protected: - - - - -private: - - - Handle(CDM_MessageDriver) myMessageDriver; - - }; - - - - - - #endif // _AppStd_Application_HeaderFile diff --git a/src/AppStdL/AppStdL_Application.cxx b/src/AppStdL/AppStdL_Application.cxx index a04b6622a2..9cead1f5d1 100644 --- a/src/AppStdL/AppStdL_Application.cxx +++ b/src/AppStdL/AppStdL_Application.cxx @@ -16,50 +16,17 @@ //AGV 15/10/01 : Add XmlOcaf support; add MessageDriver support #include -#include -#include -#include IMPLEMENT_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application) -//======================================================================= -//function : AppStdL_Application -//purpose : -//======================================================================= -AppStdL_Application::AppStdL_Application() -{ - myMessageDriver = new CDM_COutMessageDriver; -} - -//======================================================================= -//function : MessageDriver -//purpose : -//======================================================================= - -Handle(CDM_MessageDriver) AppStdL_Application::MessageDriver () -{ - return myMessageDriver; -} - -//======================================================================= -//function : Formats -//purpose : -//======================================================================= -void AppStdL_Application::Formats(TColStd_SequenceOfExtendedString& theFormats) -{ - theFormats.Append("OCC-StdLite"); - theFormats.Append("XmlLOcaf"); - theFormats.Append("BinLOcaf"); -} - //======================================================================= //function : ResourcesName //purpose : //======================================================================= -Standard_CString AppStdL_Application::ResourcesName() { +Standard_CString AppStdL_Application::ResourcesName() +{ const Standard_CString aRes = "StandardLite"; - //const Standard_CString aRes = "Standard"; return aRes; } diff --git a/src/AppStdL/AppStdL_Application.hxx b/src/AppStdL/AppStdL_Application.hxx index 7c0987b1ef..e6d668c34b 100644 --- a/src/AppStdL/AppStdL_Application.hxx +++ b/src/AppStdL/AppStdL_Application.hxx @@ -28,46 +28,15 @@ class CDM_MessageDriver; class AppStdL_Application; DEFINE_STANDARD_HANDLE(AppStdL_Application, TDocStd_Application) - +//! Legacy class defining resources name for lite OCAF documents class AppStdL_Application : public TDocStd_Application { - public: - - - Standard_EXPORT AppStdL_Application(); - - Standard_EXPORT virtual Handle(CDM_MessageDriver) MessageDriver() Standard_OVERRIDE; - - //! returns supported format for application documents. - Standard_EXPORT virtual void Formats (TColStd_SequenceOfExtendedString& theFormats) Standard_OVERRIDE; - //! returns the file name which contains application //! resources Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; - - - DEFINE_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application) - -protected: - - - - -private: - - - Handle(CDM_MessageDriver) myMessageDriver; - - }; - - - - - - #endif // _AppStdL_Application_HeaderFile diff --git a/src/BinDrivers/BinDrivers.cxx b/src/BinDrivers/BinDrivers.cxx index e611214898..5f54223d21 100644 --- a/src/BinDrivers/BinDrivers.cxx +++ b/src/BinDrivers/BinDrivers.cxx @@ -31,6 +31,7 @@ #include #include #include +#include static Standard_GUID BinStorageDriver ("03a56835-8269-11d5-aab2-0050044b1af1"); static Standard_GUID BinRetrievalDriver("03a56836-8269-11d5-aab2-0050044b1af1"); @@ -66,6 +67,17 @@ const Handle(Standard_Transient)& BinDrivers::Factory(const Standard_GUID& theGU return aNullHandle; } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void BinDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("BinOcaf", "Binary OCAF Document", "cbf", + new BinDrivers_DocumentRetrievalDriver, + new BinDrivers_DocumentStorageDriver); +} + //======================================================================= //function : AttributeDrivers //purpose : diff --git a/src/BinDrivers/BinDrivers.hxx b/src/BinDrivers/BinDrivers.hxx index b8c6c80e14..80fa7df994 100644 --- a/src/BinDrivers/BinDrivers.hxx +++ b/src/BinDrivers/BinDrivers.hxx @@ -16,8 +16,6 @@ #ifndef _BinDrivers_HeaderFile #define _BinDrivers_HeaderFile -#include -#include #include class Standard_Transient; @@ -27,47 +25,22 @@ class CDM_MessageDriver; class TCollection_AsciiString; class BinDrivers_DocumentStorageDriver; class BinDrivers_DocumentRetrievalDriver; - - +class TDocStd_Application; class BinDrivers { public: - - DEFINE_STANDARD_ALLOC - - Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& theGUID); + //! Defines format "BinOcaf" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + //! Creates the table of drivers of types supported Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& MsgDrv); //! returns "1" Standard_EXPORT static TCollection_AsciiString StorageVersion(); - - - - -protected: - - - - - -private: - - - - -friend class BinDrivers_DocumentStorageDriver; -friend class BinDrivers_DocumentRetrievalDriver; - }; - - - - - - #endif // _BinDrivers_HeaderFile diff --git a/src/BinLDrivers/BinLDrivers.cxx b/src/BinLDrivers/BinLDrivers.cxx index 5ed6d3916d..2f0fa887fb 100644 --- a/src/BinLDrivers/BinLDrivers.cxx +++ b/src/BinLDrivers/BinLDrivers.cxx @@ -28,6 +28,7 @@ #include #include #include +#include //#include static Standard_GUID BinLStorageDriver ("13a56835-8269-11d5-aab2-0050044b1af1"); @@ -65,6 +66,17 @@ const Handle(Standard_Transient)& BinLDrivers::Factory(const Standard_GUID& theG return aNullHandle; } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void BinLDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("BinLOcaf", "Binary Lite OCAF Document", "cbfl", + new BinLDrivers_DocumentRetrievalDriver, + new BinLDrivers_DocumentStorageDriver); +} + //======================================================================= //function : AttributeDrivers //purpose : diff --git a/src/BinLDrivers/BinLDrivers.hxx b/src/BinLDrivers/BinLDrivers.hxx index d997bd77e6..444b76fb5b 100644 --- a/src/BinLDrivers/BinLDrivers.hxx +++ b/src/BinLDrivers/BinLDrivers.hxx @@ -16,8 +16,6 @@ #ifndef _BinLDrivers_HeaderFile #define _BinLDrivers_HeaderFile -#include -#include #include class Standard_Transient; @@ -28,48 +26,23 @@ class TCollection_AsciiString; class BinLDrivers_DocumentStorageDriver; class BinLDrivers_DocumentRetrievalDriver; class BinLDrivers_DocumentSection; - - +class TDocStd_Application; class BinLDrivers { public: - DEFINE_STANDARD_ALLOC - - Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& theGUID); + //! Defines format "BinLOcaf" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + //! Creates a table of the supported drivers' types Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& MsgDrv); //! returns last storage version Standard_EXPORT static TCollection_AsciiString StorageVersion(); - - - - -protected: - - - - - -private: - - - - -friend class BinLDrivers_DocumentStorageDriver; -friend class BinLDrivers_DocumentRetrievalDriver; -friend class BinLDrivers_DocumentSection; - }; - - - - - - #endif // _BinLDrivers_HeaderFile diff --git a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx index 4d3a397800..baa3898067 100644 --- a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx +++ b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx @@ -56,17 +56,6 @@ BinLDrivers_DocumentStorageDriver::BinLDrivers_DocumentStorageDriver () { } -//======================================================================= -//function : SchemaName -//purpose : -//======================================================================= - -TCollection_ExtendedString BinLDrivers_DocumentStorageDriver::SchemaName() const -{ - TCollection_ExtendedString schemaname; - return schemaname; -} - //======================================================================= //function : Write //purpose : @@ -442,7 +431,7 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection aObjNb, BinLDrivers::StorageVersion(), Storage_Schema::ICreationDate(), - TCollection_AsciiString(SchemaName(),'?'), + "", // schema name aShemaVer, theData->ApplicationName(), theData->ApplicationVersion(), @@ -471,7 +460,7 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection aObjNb, BinLDrivers::StorageVersion(), Storage_Schema::ICreationDate(), - TCollection_AsciiString(SchemaName(),'?'), + "", // schema name aShemaVer, theData->ApplicationName(), theData->ApplicationVersion(), diff --git a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx index f8cdb2c095..be8083a5ff 100644 --- a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx +++ b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx @@ -50,10 +50,7 @@ public: //! Constructor Standard_EXPORT BinLDrivers_DocumentStorageDriver(); - - //! pure virtual method definition - Standard_EXPORT virtual TCollection_ExtendedString SchemaName() const Standard_OVERRIDE; - + //! Write to the binary file Standard_EXPORT virtual void Write (const Handle(CDM_Document)& theDocument, const TCollection_ExtendedString& theFileName) Standard_OVERRIDE; diff --git a/src/BinTObjDrivers/BinTObjDrivers.cxx b/src/BinTObjDrivers/BinTObjDrivers.cxx index a3181cbfb7..03fb78a20b 100644 --- a/src/BinTObjDrivers/BinTObjDrivers.cxx +++ b/src/BinTObjDrivers/BinTObjDrivers.cxx @@ -26,6 +26,7 @@ #include #include #include +#include static Standard_GUID BinStorageDriver ("f78ff4a2-a779-11d5-aab4-0050044b1af1"); static Standard_GUID BinRetrievalDriver("f78ff4a3-a779-11d5-aab4-0050044b1af1"); @@ -55,6 +56,17 @@ const Handle(Standard_Transient)& BinTObjDrivers::Factory(const Standard_GUID& a return BinLDrivers::Factory (aGUID); } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void BinTObjDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("TObjBin", "Binary TObj OCAF Document", "cbf", + new BinTObjDrivers_DocumentRetrievalDriver, + new BinTObjDrivers_DocumentStorageDriver); +} + //======================================================================= //function : AddDrivers //purpose : diff --git a/src/BinTObjDrivers/BinTObjDrivers.hxx b/src/BinTObjDrivers/BinTObjDrivers.hxx index e59f45421a..12f0019295 100644 --- a/src/BinTObjDrivers/BinTObjDrivers.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers.hxx @@ -21,9 +21,11 @@ #include #include +class BinMDF_ADriverTable; +class CDM_MessageDriver; +class TDocStd_Application; -// Class for registering storage/retrieval drivers for TObj Bin persistence -// +//! Class for registering storage/retrieval drivers for TObj Bin persistence class BinTObjDrivers { @@ -34,6 +36,10 @@ class BinTObjDrivers (const Standard_GUID& aGUID); // Returns a driver corresponding to . Used for plugin. + //! Defines format "TObjBin" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable, const Handle(CDM_MessageDriver)& aMsgDrv); diff --git a/src/BinXCAFDrivers/BinXCAFDrivers.cxx b/src/BinXCAFDrivers/BinXCAFDrivers.cxx index 3d1d36a64f..cf14f7cb90 100644 --- a/src/BinXCAFDrivers/BinXCAFDrivers.cxx +++ b/src/BinXCAFDrivers/BinXCAFDrivers.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include static Standard_GUID BinXCAFStorageDriver ("a78ff496-a779-11d5-aab4-0050044b1af1"); static Standard_GUID BinXCAFRetrievalDriver("a78ff497-a779-11d5-aab4-0050044b1af1"); @@ -61,6 +61,17 @@ const Handle(Standard_Transient)& BinXCAFDrivers::Factory(const Standard_GUID& t return aNullHandle; } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void BinXCAFDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("BinXCAF", "Binary XCAF Document", "xbf", + new BinXCAFDrivers_DocumentRetrievalDriver, + new BinXCAFDrivers_DocumentStorageDriver); +} + //======================================================================= //function : //purpose : diff --git a/src/BinXCAFDrivers/BinXCAFDrivers.hxx b/src/BinXCAFDrivers/BinXCAFDrivers.hxx index a7539625e1..d55abbcd04 100644 --- a/src/BinXCAFDrivers/BinXCAFDrivers.hxx +++ b/src/BinXCAFDrivers/BinXCAFDrivers.hxx @@ -16,8 +16,6 @@ #ifndef _BinXCAFDrivers_HeaderFile #define _BinXCAFDrivers_HeaderFile -#include -#include #include class Standard_Transient; @@ -26,44 +24,20 @@ class BinMDF_ADriverTable; class CDM_MessageDriver; class BinXCAFDrivers_DocumentStorageDriver; class BinXCAFDrivers_DocumentRetrievalDriver; - - +class TDocStd_Application; class BinXCAFDrivers { public: - - DEFINE_STANDARD_ALLOC - Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& theGUID); + //! Defines format "BinXCAF" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + //! Creates the table of drivers of types supported Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& MsgDrv); - - - - -protected: - - - - - -private: - - - - -friend class BinXCAFDrivers_DocumentStorageDriver; -friend class BinXCAFDrivers_DocumentRetrievalDriver; - }; - - - - - - #endif // _BinXCAFDrivers_HeaderFile diff --git a/src/CDF/CDF_Application.cxx b/src/CDF/CDF_Application.cxx index 029ba7862c..3f61b100be 100644 --- a/src/CDF/CDF_Application.cxx +++ b/src/CDF/CDF_Application.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -34,8 +33,6 @@ #include #include #include -#include -#include #include IMPLEMENT_STANDARD_RTTIEXT(CDF_Application,CDM_Application) @@ -188,7 +185,17 @@ PCDM_ReaderStatus CDF_Application::CanRetrieve(const TCollection_ExtendedString& else return PCDM_RS_UnrecognizedFileFormat; } - if(!FindReaderFromFormat(theFormat)) return PCDM_RS_NoDriver; + + // check actual availability of the driver + try { + Handle(PCDM_Reader) aReader = ReaderFromFormat(theFormat); + if (aReader.IsNull()) + return PCDM_RS_NoDriver; + } + catch (Standard_Failure) + { + // no need to report error, this was just check for availability + } } } return PCDM_RS_OK; @@ -226,27 +233,6 @@ Standard_Boolean CDF_Application::SetDefaultFolder(const Standard_ExtString aFol return found; } -//======================================================================= -//function : DefaultExtension -//purpose : -//======================================================================= -Standard_ExtString CDF_Application::DefaultExtension() { - static TCollection_ExtendedString theDefaultExtension; - theDefaultExtension="*"; - TColStd_SequenceOfExtendedString theFormats; - Formats(theFormats); - - for (Standard_Integer i=1; i<= theFormats.Length(); i++) { - TCollection_ExtendedString theResource(theFormats(i)); - theResource+=".FileExtension"; - if(UTL::Find(Resources(),theResource)) { - theDefaultExtension=UTL::Value(Resources(),theResource); - return theDefaultExtension.ToExtString(); - } - } - return theDefaultExtension.ToExtString(); -} - //======================================================================= //function : Retrieve //purpose : @@ -285,11 +271,17 @@ Handle(CDM_Document) CDF_Application::Retrieve(const Handle(CDM_MetaData)& aMeta if(AlreadyRetrieved) myRetrievableStatus = PCDM_RS_AlreadyRetrieved; Standard_Boolean Modified=AlreadyRetrieved && aMetaData->Document()->IsModified(); if(Modified) myRetrievableStatus = PCDM_RS_AlreadyRetrievedAndModified; - if(!AlreadyRetrieved || Modified) { - - Handle(PCDM_Reader) theReader=Reader(aMetaData->FileName()); - - + if(!AlreadyRetrieved || Modified) + { + TCollection_ExtendedString aFormat; + if (!Format(aMetaData->FileName(), aFormat)) + { + Standard_SStream aMsg; + aMsg << "Could not determine format for the file " << aMetaData->FileName() << (char)0; + Standard_NoSuchObject::Raise(aMsg); + } + Handle(PCDM_Reader) theReader = ReaderFromFormat (aFormat); + Handle(CDM_Document) theDocument; if(Modified) { @@ -357,32 +349,6 @@ CDF_TypeOfActivation CDF_Application::TypeOfActivation(const Handle(CDM_MetaData return CDF_TOA_New; } - -//======================================================================= -//function : FindReader -//purpose : -//======================================================================= -Standard_Boolean CDF_Application::FindReader(const TCollection_ExtendedString& aFileName) { - Standard_GUID voidGUID; - TCollection_ExtendedString voidResourceName; - return FindReader(aFileName,voidGUID,voidResourceName); -} - -//======================================================================= -//function : Reader -//purpose : code dp -//======================================================================= -Handle(PCDM_Reader) CDF_Application::Reader (const TCollection_ExtendedString& aFileName) { - TCollection_ExtendedString theFormat; - if (!Format(aFileName,theFormat)) { - Standard_SStream aMsg; - aMsg << "Could not found the format" <<(char)0; - Standard_NoSuchObject::Raise(aMsg); - - } - return ReaderFromFormat (theFormat); -} - //======================================================================= //function : Read //purpose : @@ -444,71 +410,116 @@ Handle(CDM_Document) CDF_Application::Read (Standard_IStream& theIStream) return aDoc; } -//======================================================================= -//function : FindReaderFromFormat -//purpose : -//======================================================================= -Standard_Boolean CDF_Application::FindReaderFromFormat(const TCollection_ExtendedString& aFormat) { - Standard_GUID voidGUID; - TCollection_ExtendedString voidResourceName; - return FindReaderFromFormat(aFormat,voidGUID,voidResourceName); -} - - //======================================================================= //function : ReaderFromFormat //purpose : //======================================================================= -Handle(PCDM_Reader) CDF_Application::ReaderFromFormat(const TCollection_ExtendedString& aFormat) { - TCollection_ExtendedString UnfoundResourceName; - Standard_GUID thePluginId; - if(!FindReaderFromFormat(aFormat,thePluginId,UnfoundResourceName)) { +Handle(PCDM_Reader) CDF_Application::ReaderFromFormat(const TCollection_ExtendedString& theFormat) +{ + // check map of readers + Handle(PCDM_RetrievalDriver) aReader; + if (myReaders.Find (theFormat, aReader)) + return aReader; + + // support of legacy method of loading reader as plugin + TCollection_ExtendedString aResourceName = theFormat; + aResourceName += ".RetrievalPlugin"; + if (!UTL::Find(Resources(), aResourceName)) + { + myReaders.Bind(theFormat, aReader); Standard_SStream aMsg; - aMsg << "Could not found the item:" << UnfoundResourceName <<(char)0; + aMsg << "Could not found the item:" << aResourceName <<(char)0; myRetrievableStatus = PCDM_RS_WrongResource; Standard_NoSuchObject::Raise(aMsg); - } - Handle(PCDM_Reader) R; + } + + // Get GUID as a string. + TCollection_ExtendedString strPluginId = UTL::Value(Resources(), aResourceName); + + // If the GUID (as a string) contains blanks, remove them. + if (strPluginId.Search(' ') != -1) + strPluginId.RemoveAll(' '); + + // Convert to GUID. + Standard_GUID aPluginId = UTL::GUID(strPluginId); + try { OCC_CATCH_SIGNALS - R = Handle(PCDM_Reader)::DownCast(Plugin::Load(thePluginId)); + aReader = Handle(PCDM_RetrievalDriver)::DownCast(Plugin::Load(aPluginId)); } - catch (Standard_Failure) { + catch (Standard_Failure) + { + myReaders.Bind(theFormat, aReader); myRetrievableStatus = PCDM_RS_WrongResource; - Standard_SStream aMsg; - aMsg << Standard_Failure::Caught() << endl; - Standard_Failure::Raise(aMsg); + Standard_Failure::Caught()->Reraise(); } - Handle(PCDM_RetrievalDriver) RD = Handle(PCDM_RetrievalDriver)::DownCast(R); - if (!RD.IsNull()) { - RD->SetFormat(aFormat); - return RD; - } else + if (!aReader.IsNull()) { + aReader->SetFormat(theFormat); + } + else + { myRetrievableStatus = PCDM_RS_WrongResource; - return R; + } + + // record in map + myReaders.Bind (theFormat, aReader); + return aReader; } //======================================================================= -//function : FindReader +//function : WriterFromFormat //purpose : //======================================================================= -Standard_Boolean CDF_Application::FindReader(const TCollection_ExtendedString& aFileName, Standard_GUID& thePluginId, TCollection_ExtendedString& ResourceName) { - - TCollection_ExtendedString theFormat=PCDM_ReadWriter::FileFormat(aFileName); +Handle(PCDM_StorageDriver) CDF_Application::WriterFromFormat(const TCollection_ExtendedString& theFormat) +{ + // check map of writers + Handle(PCDM_StorageDriver) aDriver; + if (myWriters.Find (theFormat, aDriver)) + return aDriver; -// It is good if the format is in the file. Otherwise base on the extension. - - if(theFormat.Length()==0) { - ResourceName=UTL::Extension(aFileName); - ResourceName+=".FileFormat"; - - if(UTL::Find(Resources(),ResourceName)) { - theFormat=UTL::Value(Resources(),ResourceName); - } - else - return Standard_False; + // support of legacy method of loading reader as plugin + TCollection_ExtendedString aResourceName = theFormat; + aResourceName += ".StoragePlugin"; + if(!UTL::Find(Resources(), aResourceName)) + { + myWriters.Bind (theFormat, aDriver); + Standard_SStream aMsg; + aMsg << "Could not found the resource definition:" << aResourceName <<(char)0; + Standard_NoSuchObject::Raise(aMsg); } - return FindReaderFromFormat(theFormat,thePluginId,ResourceName); + + // Get GUID as a string. + TCollection_ExtendedString strPluginId = UTL::Value(Resources(), aResourceName); + + // If the GUID (as a string) contains blanks, remove them. + if (strPluginId.Search(' ') != -1) + strPluginId.RemoveAll(' '); + + // Convert to GUID. + Standard_GUID aPluginId = UTL::GUID(strPluginId); + + try { + OCC_CATCH_SIGNALS + aDriver = Handle(PCDM_StorageDriver)::DownCast(Plugin::Load(aPluginId)); + } + catch (Standard_Failure) + { + myWriters.Bind (theFormat, aDriver); + myRetrievableStatus = PCDM_RS_WrongResource; + Standard_Failure::Caught()->Reraise(); + } + if (aDriver.IsNull()) + { + myRetrievableStatus = PCDM_RS_WrongResource; + } + else + { + aDriver->SetFormat(theFormat); + } + + // record in map + myWriters.Bind(theFormat, aDriver); + return aDriver; } //======================================================================= @@ -534,30 +545,6 @@ Standard_Boolean CDF_Application::Format(const TCollection_ExtendedString& aFile return Standard_True; } -//======================================================================= -//function : FindReaderFromFormat -//purpose : -//======================================================================= -Standard_Boolean CDF_Application::FindReaderFromFormat(const TCollection_ExtendedString& aFormat, Standard_GUID& thePluginId, TCollection_ExtendedString& ResourceName) { - - ResourceName=aFormat; - ResourceName+=".RetrievalPlugin"; - - if(UTL::Find(Resources(),ResourceName)) { - // Get GUID as a string. - TCollection_ExtendedString strPluginId = UTL::Value(Resources(),ResourceName); - - // If the GUID (as a string) contains blanks, remove them. - if (strPluginId.Search(' ') != -1) - strPluginId.RemoveAll(' '); - - // Convert to GUID. - thePluginId=UTL::GUID(strPluginId); - return Standard_True; - } - return Standard_False; -} - //======================================================================= //function : CanRetrieve //purpose : diff --git a/src/CDF/CDF_Application.hxx b/src/CDF/CDF_Application.hxx index 116aea1830..926f47e7e6 100644 --- a/src/CDF/CDF_Application.hxx +++ b/src/CDF/CDF_Application.hxx @@ -17,19 +17,14 @@ #ifndef _CDF_Application_HeaderFile #define _CDF_Application_HeaderFile -#include -#include - #include #include #include #include -#include #include #include -#include -#include #include +#include class Standard_NoSuchObject; class CDF_Session; @@ -38,7 +33,8 @@ class CDM_Document; class TCollection_ExtendedString; class PCDM_Reader; class CDM_MetaData; - +class PCDM_RetrievalDriver; +class PCDM_StorageDriver; class CDF_Application; DEFINE_STANDARD_HANDLE(CDF_Application, CDM_Application) @@ -113,22 +109,40 @@ public: Standard_EXPORT PCDM_ReaderStatus CanRetrieve (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName, const TCollection_ExtendedString& aVersion); - Standard_EXPORT virtual void Formats (TColStd_SequenceOfExtendedString& Formats) = 0; - //! Checks status after Retrieve - PCDM_ReaderStatus GetRetrieveStatus() const; + PCDM_ReaderStatus GetRetrieveStatus() const { return myRetrievableStatus; } - Standard_EXPORT Standard_Boolean FindReader (const TCollection_ExtendedString& aFileName); - - Standard_EXPORT Handle(PCDM_Reader) Reader (const TCollection_ExtendedString& aFileName); - //! Reads aDoc from standard SEEKABLE stream theIStream, //! the stream should support SEEK fuctionality Standard_EXPORT Handle(CDM_Document) Read (Standard_IStream& theIStream); - Standard_EXPORT Standard_Boolean FindReaderFromFormat (const TCollection_ExtendedString& aFormat); + //! Returns instance of read driver for specified format. + //! + //! Default implementation uses plugin mechanism to load reader dynamically. + //! For this to work, application resources should define GUID of + //! the plugin as value of [Format].RetrievalPlugin, and "Plugin" + //! resource should define name of plugin library to be loaded as + //! value of [GUID].Location. Plugin library should provide + //! method PLUGINFACTORY returning instance of the reader for the + //! same GUID (see Plugin_Macro.hxx). + //! + //! In case if reader is not available, will raise Standard_NoSuchObject + //! or other exception if raised by plugin loader. + Standard_EXPORT virtual Handle(PCDM_Reader) ReaderFromFormat (const TCollection_ExtendedString& aFormat); - Standard_EXPORT Handle(PCDM_Reader) ReaderFromFormat (const TCollection_ExtendedString& aFormat); + //! Returns instance of storage driver for specified format. + //! + //! Default implementation uses plugin mechanism to load driver dynamically. + //! For this to work, application resources should define GUID of + //! the plugin as value of [Format].StoragePlugin, and "Plugin" + //! resource should define name of plugin library to be loaded as + //! value of [GUID].Location. Plugin library should provide + //! method PLUGINFACTORY returning instance of the reader for the + //! same GUID (see Plugin_Macro.hxx). + //! + //! In case if driver is not available, will raise Standard_NoSuchObject + //! or other exception if raised by plugin loader. + Standard_EXPORT virtual Handle(PCDM_StorageDriver) WriterFromFormat (const TCollection_ExtendedString& aFormat); //! try to retrieve a Format directly in the file or in //! application resource by using extension. returns @@ -139,9 +153,6 @@ public: Standard_EXPORT Standard_Boolean SetDefaultFolder (const Standard_ExtString aFolder); - Standard_EXPORT Standard_ExtString DefaultExtension(); - - friend class CDF_Session; @@ -153,7 +164,8 @@ protected: Standard_EXPORT CDF_Application(); PCDM_ReaderStatus myRetrievableStatus; - + NCollection_DataMap myReaders; + NCollection_DataMap myWriters; private: @@ -179,24 +191,12 @@ private: Standard_EXPORT Standard_Integer DocumentVersion (const Handle(CDM_MetaData)& theMetaData) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean FindReader (const TCollection_ExtendedString& aFileName, Standard_GUID& PluginIn, TCollection_ExtendedString& ResourceName); - - Standard_EXPORT Standard_Boolean FindReaderFromFormat (const TCollection_ExtendedString& aFormat, Standard_GUID& PluginIn, TCollection_ExtendedString& ResourceName); - Standard_EXPORT CDF_TypeOfActivation TypeOfActivation (const Handle(CDM_MetaData)& aMetaData); Standard_EXPORT PCDM_ReaderStatus CanRetrieve (const Handle(CDM_MetaData)& aMetaData); +private: TCollection_ExtendedString myDefaultFolder; - - }; - -#include - - - - - #endif // _CDF_Application_HeaderFile diff --git a/src/CDF/CDF_Application.lxx b/src/CDF/CDF_Application.lxx deleted file mode 100644 index 457b84e84f..0000000000 --- a/src/CDF/CDF_Application.lxx +++ /dev/null @@ -1,18 +0,0 @@ -// Created on: 2003-06-26 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2003-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -inline PCDM_ReaderStatus CDF_Application::GetRetrieveStatus() const { - return myRetrievableStatus; -} diff --git a/src/CDF/CDF_Session.cxx b/src/CDF/CDF_Session.cxx index 43e4331d21..7c15099888 100644 --- a/src/CDF/CDF_Session.cxx +++ b/src/CDF/CDF_Session.cxx @@ -123,17 +123,9 @@ Handle(CDF_MetaDataDriver) CDF_Session::MetaDataDriver() const { //======================================================================= void CDF_Session::LoadDriver() { if (myMetaDataDriver.IsNull()) { + // for compatibility with old code, initialize useless driver directly + // instead of loading it as plugin Handle(CDF_MetaDataDriverFactory) aFactory; - try { - aFactory = Handle(CDF_MetaDataDriverFactory)::DownCast ( - Plugin::Load (Standard_GUID ("a148e300-5740-11d1-a904-080036aaa103"), - Standard_False /*theVerbose*/)); - } catch (const Standard_Failure&) { - } - if (!aFactory.IsNull()) { - myMetaDataDriver = aFactory->Build(); - } else { - myMetaDataDriver = new CDF_FWOSDriver; - } + myMetaDataDriver = new CDF_FWOSDriver; } } diff --git a/src/CDF/CDF_Store.cxx b/src/CDF/CDF_Store.cxx index 9a44647dfb..74baa5e148 100644 --- a/src/CDF/CDF_Store.cxx +++ b/src/CDF/CDF_Store.cxx @@ -65,34 +65,6 @@ void CDF_Store::Init() { myCurrentDocument = myMainDocument; } -CDF_TryStoreStatus CDF_Store::Check() { - if(!PCDM::FindStorageDriver(myMainDocument)) return CDF_TS_NoDriver; - - - // Checking the subcomponent. - Handle(CDM_Document) theCurrentDocument; - myList->Init(); - for ( myList->Init(); myList->More(); myList->Next()) { - theCurrentDocument = myList->Value(); - - if(theCurrentDocument != myMainDocument) { - if( theCurrentDocument->IsModified()) { - - myLastName = theCurrentDocument->Presentation(); - - if(!PCDM::FindStorageDriver(theCurrentDocument)) return CDF_TS_NoDriver; - - } - } - } - return CDF_TS_OK; -} - - -Standard_ExtString CDF_Store::LastName() const { - return myLastName.ToExtString(); -} - Standard_ExtString CDF_Store::Folder() const { static TCollection_ExtendedString retv; if(myCurrentDocument->HasRequestedFolder()) diff --git a/src/CDF/CDF_Store.hxx b/src/CDF/CDF_Store.hxx index dc941b7c13..537fe6708e 100644 --- a/src/CDF/CDF_Store.hxx +++ b/src/CDF/CDF_Store.hxx @@ -44,28 +44,6 @@ public: //! creates a store list from the document of the current selection. Standard_EXPORT CDF_Store(const Handle(CDM_Document)& aDocument); - //! Checks will make the following control. Check must be used before - //! using Create method. Check will not be done twice by Create. - //! - //! 1) controls whether there is one document in the current selection. - //! 2) controls whether there is a storage driver for the document. - //! 3) controls whether the applicationdatatype associated with the driver - //! exists as metadata in the metadata manager (Design Manager for example). - //! 4) controls whether there is a storage driver for each subcomponents - //! of the document if there are. If the control fails for a subcomponent, - //! the control stops and name and type of this subcomponent can be get - //! with LastName method - //! 5) controls whether the applicationdatatype associated with the driver of - //! each subcomponent exists as metadata in the metadata manager - //! (Design Manager for example). If the control fails for a subcomponent, - //! the control stops and name and type of this subcomponent can be get - //! with LastName method - Standard_EXPORT CDF_TryStoreStatus Check(); - - //! in the case of a subcomponent for which no storage driver exists, - //! returns the name of the subcomponent if there is one. - Standard_EXPORT Standard_ExtString LastName() const; - //! returns the folder in which the current document will be stored. Standard_EXPORT Standard_ExtString Folder() const; @@ -181,7 +159,6 @@ private: Handle(CDM_Document) myCurrentDocument; Standard_Boolean myHasSubComponents; Standard_Boolean myIsMainDocument; - TCollection_ExtendedString myLastName; TCollection_ExtendedString myPath; TCollection_ExtendedString myText; PCDM_StoreStatus myStatus; diff --git a/src/CDF/CDF_StoreList.cxx b/src/CDF/CDF_StoreList.cxx index d30ef39fd0..619af206e2 100644 --- a/src/CDF/CDF_StoreList.cxx +++ b/src/CDF/CDF_StoreList.cxx @@ -91,7 +91,15 @@ PCDM_StoreStatus CDF_StoreList::Store (Handle(CDM_MetaData)& aMetaData, TCollect Handle(CDM_Document) theDocument = myStack.First(); if( theDocument == myMainDocument || theDocument->IsModified()) { - if(!PCDM::FindStorageDriver(theDocument)){ + Handle(CDF_Application) anApp = Handle(CDF_Application)::DownCast (theDocument->Application()); + if (anApp.IsNull()) + { + Standard_Failure::Raise("Document has no application, cannot save!"); + } + Handle(PCDM_StorageDriver) aDocumentStorageDriver = + anApp->WriterFromFormat(theDocument->StorageFormat()); + if (aDocumentStorageDriver.IsNull()) + { Standard_SStream aMsg; aMsg <<"No storage driver does exist for this format: " << theDocument->StorageFormat() << (char)0; Standard_Failure::Raise(aMsg); @@ -105,8 +113,6 @@ PCDM_StoreStatus CDF_StoreList::Store (Handle(CDM_MetaData)& aMetaData, TCollect TCollection_ExtendedString theName=theMetaDataDriver->BuildFileName(theDocument); CDF_Timer theTimer; - Handle(PCDM_StorageDriver) aDocumentStorageDriver = PCDM::StorageDriver(theDocument); - aDocumentStorageDriver->Write(theDocument,theName); status = aDocumentStorageDriver->GetStoreStatus(); diff --git a/src/CDF/FILES b/src/CDF/FILES index f705681227..0c82247db5 100755 --- a/src/CDF/FILES +++ b/src/CDF/FILES @@ -2,7 +2,6 @@ CDF.cxx CDF.hxx CDF_Application.cxx CDF_Application.hxx -CDF_Application.lxx CDF_Directory.cxx CDF_Directory.hxx CDF_DirectoryIterator.cxx diff --git a/src/CDM/CDM_Application.hxx b/src/CDM/CDM_Application.hxx index b1e8326d0e..e1bd624394 100644 --- a/src/CDM/CDM_Application.hxx +++ b/src/CDM/CDM_Application.hxx @@ -42,8 +42,8 @@ class CDM_Application : public Standard_Transient public: - //! the manager returned by this virtual method will be - //! used to search for Format`.Retrieval resource items. + //! The manager returned by this virtual method will be + //! used to search for Format.Retrieval resource items. Standard_EXPORT virtual Handle(Resource_Manager) Resources() = 0; //! By default returns a NullMessageDriver; diff --git a/src/CDM/CDM_Document.cxx b/src/CDM/CDM_Document.cxx index d731826158..4a2352003e 100644 --- a/src/CDM/CDM_Document.cxx +++ b/src/CDM/CDM_Document.cxx @@ -60,12 +60,7 @@ CDM_Document::CDM_Document(): myRequestedNameIsDefined (Standard_False), myRequestedPreviousVersionIsDefined(Standard_False), myFileExtensionWasFound (Standard_False), - myDataTypeWasFound (Standard_False), - myVersionDataTypeWasFound (Standard_False), - myDescriptionWasFound (Standard_False), - myDomainWasFound (Standard_False), - myStoragePluginWasFound (Standard_False), - myDefaultPresentationWasFound (Standard_False) + myDescriptionWasFound (Standard_False) {} @@ -518,7 +513,7 @@ void CDM_Document::Comments(TColStd_SequenceOfExtendedString& aComments) const Standard_ExtString CDM_Document::Comment() const { if (myComments.Length() < 1) - return TCollection_ExtendedString().ToExtString(); + return 0; return myComments(1).ToExtString(); } @@ -556,7 +551,6 @@ void CDM_Document::ComputePresentation() TCollection_ExtendedString presentation(""); static Standard_Integer theUnnamedDocuments(0); static CDM_NamesDirectory theNames; - static CDM_NamesDirectory theTypes; if(!myMetaData.IsNull()) { presentation += myMetaData->Name(); @@ -571,21 +565,8 @@ void CDM_Document::ComputePresentation() } } else { - LoadResources(); - if(myDefaultPresentationWasFound) { -// presentation += "$"; - presentation += myDefaultPresentation; - if(!theTypes.IsBound(presentation)) theTypes.Bind(presentation,0); - Standard_Integer range = theTypes(presentation); - range +=1; - theTypes(presentation) = range; - presentation += "_"; - presentation += range; - } - else { - presentation += TCollection_ExtendedString("Document_"); - presentation += ++theUnnamedDocuments; - } + presentation = "Document_"; + presentation += ++theUnnamedDocuments; } if(getPresentations().IsBound(presentation)) { @@ -1167,46 +1148,13 @@ void CDM_Document::LoadResources() FIND(theDocumentResource, theResourceName,myFileExtensionWasFound,myFileExtension); - theResourceName=theFormat; - theResourceName+="DataType"; - FIND(theDocumentResource,theResourceName,myDataTypeWasFound,myDataType); - - - theResourceName=theFormat; - theResourceName+="VersionDataType"; - FIND(theDocumentResource, - theResourceName,myVersionDataTypeWasFound,myVersionDataType); - theResourceName=theFormat; theResourceName+="Description"; FIND(theDocumentResource,theResourceName,myDescriptionWasFound,myDescription); - theResourceName=theFormat; - theResourceName+="Domain"; - FIND(theDocumentResource,theResourceName,myDomainWasFound,myDomain); - - theResourceName=theFormat; - theResourceName+="Presentation"; - FIND(theDocumentResource, - theResourceName,myDefaultPresentationWasFound,myDefaultPresentation); - - theResourceName=theFormat; - theResourceName+="StoragePlugin"; - TCollection_ExtendedString thePluginId; - FIND(theDocumentResource,theResourceName,myStoragePluginWasFound,thePluginId); - if(myStoragePluginWasFound) - { - // Check whether the GUID (as a string) contains blanks before and after the string. - // If it is so, remove them. - if (thePluginId.Search(' ') != -1) - thePluginId.RemoveAll(' '); - - // Convert to GUID. - myStoragePlugin=UTL::GUID(thePluginId); - } myResourcesAreLoaded=Standard_True; -// cout << "resource Loaded: Format: " << theFormat << ", FileExtension:" << myFileExtension << ", DataType:" << myDataType << ", VersionDataType:" << myVersionDataType << ", Description:" << myDescription << ", Domain:" << myDomain << endl; +// cout << "resource Loaded: Format: " << theFormat << ", FileExtension:" << myFileExtension << ", Description:" << myDescription << endl; } return; } @@ -1233,50 +1181,6 @@ TCollection_ExtendedString CDM_Document::FileExtension() return myFileExtension; } -//======================================================================= -//function : FindDataType -//purpose : -//======================================================================= - -Standard_Boolean CDM_Document::FindDataType () -{ - LoadResources(); - return myDataTypeWasFound; -} - -//======================================================================= -//function : DataType -//purpose : -//======================================================================= - -TCollection_ExtendedString CDM_Document::DataType() -{ - LoadResources(); - return myDataType; -} - -//======================================================================= -//function : FindVersionDataType -//purpose : -//======================================================================= - -Standard_Boolean CDM_Document::FindVersionDataType () -{ - LoadResources(); - return myVersionDataTypeWasFound; -} - -//======================================================================= -//function : VersionDataType -//purpose : -//======================================================================= - -TCollection_ExtendedString CDM_Document::VersionDataType() -{ - LoadResources(); - return myVersionDataType; -} - //======================================================================= //function : FindDescription //purpose : @@ -1299,50 +1203,6 @@ TCollection_ExtendedString CDM_Document::Description() return myDescription; } -//======================================================================= -//function : FindDomain -//purpose : -//======================================================================= - -Standard_Boolean CDM_Document::FindDomain () -{ - LoadResources(); - return myDomainWasFound; -} - -//======================================================================= -//function : Domain -//purpose : -//======================================================================= - -TCollection_ExtendedString CDM_Document::Domain() -{ - LoadResources(); - return myDomain; -} - -//======================================================================= -//function : FindStoragePlugin -//purpose : -//======================================================================= - -Standard_Boolean CDM_Document::FindStoragePlugin() -{ - LoadResources(); - return myStoragePluginWasFound; -} - -//======================================================================= -//function : StoragePlugin -//purpose : -//======================================================================= - -Standard_GUID CDM_Document::StoragePlugin() -{ - LoadResources(); - return myStoragePlugin; -} - //======================================================================= //function : IsReadOnly //purpose : diff --git a/src/CDM/CDM_Document.hxx b/src/CDM/CDM_Document.hxx index 5cc70e5554..1b2d3d8f13 100644 --- a/src/CDM/CDM_Document.hxx +++ b/src/CDM/CDM_Document.hxx @@ -20,17 +20,12 @@ #include #include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include #include -#include + class CDM_MetaData; class CDM_Application; class Standard_NoSuchObject; @@ -40,8 +35,6 @@ class CDM_Reference; class CDM_ReferenceIterator; class TCollection_ExtendedString; class Resource_Manager; -class Standard_GUID; - class CDM_Document; DEFINE_STANDARD_HANDLE(CDM_Document, Standard_Transient) @@ -292,33 +285,11 @@ public: //! gets the Desktop.Domain.Application.`FileFormat`.FileExtension resource. Standard_EXPORT TCollection_ExtendedString FileExtension(); - Standard_EXPORT Standard_Boolean FindDataType(); - - //! this datatype will be used if the DBMS deals with this concept - //! gets the `FileFormat`.DataType resource. - //! concept. - Standard_EXPORT TCollection_ExtendedString DataType(); - - Standard_EXPORT Standard_Boolean FindVersionDataType(); - - //! this datatype will be used if the DBMS deals with this concept - //! gets the `FileFormat`.VersionDataType resource. - Standard_EXPORT TCollection_ExtendedString VersionDataType(); - Standard_EXPORT Standard_Boolean FindDescription(); //! gets the `FileFormat`.Description resource. Standard_EXPORT TCollection_ExtendedString Description(); - Standard_EXPORT Standard_Boolean FindDomain(); - - //! gets the `FileFormat`.Domain resource. - Standard_EXPORT TCollection_ExtendedString Domain(); - - Standard_EXPORT Standard_Boolean FindStoragePlugin(); - - Standard_EXPORT Standard_GUID StoragePlugin(); - //! returns true if the version is greater than the //! storage version Standard_EXPORT Standard_Boolean IsModified() const; @@ -423,19 +394,9 @@ private: Standard_Boolean myRequestedPreviousVersionIsDefined; TCollection_ExtendedString myRequestedPreviousVersion; TCollection_ExtendedString myFileExtension; - TCollection_ExtendedString myDataType; - TCollection_ExtendedString myVersionDataType; TCollection_ExtendedString myDescription; - TCollection_ExtendedString myDomain; - TCollection_ExtendedString myDefaultPresentation; Standard_Boolean myFileExtensionWasFound; - Standard_Boolean myDataTypeWasFound; - Standard_Boolean myVersionDataTypeWasFound; Standard_Boolean myDescriptionWasFound; - Standard_Boolean myDomainWasFound; - Standard_Boolean myStoragePluginWasFound; - Standard_Boolean myDefaultPresentationWasFound; - Standard_GUID myStoragePlugin; Handle(CDM_Application) myApplication; diff --git a/src/DDocStd/DDocStd.cxx b/src/DDocStd/DDocStd.cxx index 31114a1b45..a71b30737b 100644 --- a/src/DDocStd/DDocStd.cxx +++ b/src/DDocStd/DDocStd.cxx @@ -30,22 +30,35 @@ #include #include +#include +#include +#include +#include +#include +#include + //======================================================================= //function : Find //purpose : //======================================================================= -Standard_Boolean DDocStd::Find (Handle(TDocStd_Application)& A, - const Standard_Boolean /*Complain*/) -{ - if (!CDF_Session::Exists()) - Standard_DomainError::Raise("DDocStd::Find no applicative session"); - Handle(CDF_Session) S = CDF_Session::CurrentSession(); - Handle(TDocStd_Application) APP; - if (!S->HasCurrentApplication()) - Standard_DomainError::Raise("DDocStd::Find no applicative session"); - APP = Handle(TDocStd_Application)::DownCast(S->CurrentApplication()); - A = APP; - return Standard_True; + +const Handle(TDocStd_Application)& DDocStd::GetApplication() +{ + static Handle(TDocStd_Application) anApp; + if (anApp.IsNull()) + { + anApp = new TDocStd_Application; + + // Initialize standard document formats at creation - they should + // be available even if this DRAW plugin is not loaded by pload command + StdLDrivers::DefineFormat(anApp); + BinLDrivers::DefineFormat(anApp); + XmlLDrivers::DefineFormat(anApp); + StdDrivers::DefineFormat(anApp); + BinDrivers::DefineFormat(anApp); + XmlDrivers::DefineFormat(anApp); + } + return anApp; } @@ -136,7 +149,6 @@ void DDocStd::AllCommands(Draw_Interpretor& theCommands) if (done) return; done = Standard_True; - // define commands DDocStd::ApplicationCommands(theCommands); DDocStd::DocumentCommands(theCommands); diff --git a/src/DDocStd/DDocStd.hxx b/src/DDocStd/DDocStd.hxx index cbca7da93d..c239165cf0 100644 --- a/src/DDocStd/DDocStd.hxx +++ b/src/DDocStd/DDocStd.hxx @@ -50,9 +50,8 @@ public: DEFINE_STANDARD_ALLOC - //! return the application of the session. False - //! if there is noone current application. - Standard_EXPORT static Standard_Boolean Find (Handle(TDocStd_Application)& Appli, const Standard_Boolean Complain = Standard_True); + //! Returns the global instance of application. + Standard_EXPORT static const Handle(TDocStd_Application)& GetApplication (); Standard_EXPORT static Standard_Boolean GetDocument (Standard_CString& Name, Handle(TDocStd_Document)& Doc, const Standard_Boolean Complain = Standard_True); diff --git a/src/DDocStd/DDocStd_ApplicationCommands.cxx b/src/DDocStd/DDocStd_ApplicationCommands.cxx index 577eaa8075..fe590e4fad 100644 --- a/src/DDocStd/DDocStd_ApplicationCommands.cxx +++ b/src/DDocStd/DDocStd_ApplicationCommands.cxx @@ -56,8 +56,7 @@ static Standard_Integer DDocStd_ListDocuments (Draw_Interpretor& di, const char** /*a*/) { if (nb == 1) { - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); Handle(TDocStd_Document) D; Standard_Integer nbdoc = A->NbDocuments(); for (Standard_Integer i = 1; i <= nbdoc; i++) { @@ -105,8 +104,7 @@ static Standard_Integer DDocStd_NewDocument (Draw_Interpretor& di, } if (nb == 3) { if (!DDocStd::GetDocument(a[1],D,Standard_False)) { - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); A->NewDocument(a[2],D); DD = new DDocStd_DrawDocument(D); TDataStd_Name::Set(D->GetData()->Root(),a[1]); @@ -132,8 +130,7 @@ static Standard_Integer DDocStd_Open (Draw_Interpretor& di, { if (nb >= 3) { TCollection_ExtendedString path (a[1]); - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); Handle(TDocStd_Document) D; Standard_Integer insession = A->IsInSession(path); if (insession > 0) { @@ -216,8 +213,7 @@ static Standard_Integer DDocStd_Save (Draw_Interpretor& di, if (nb == 2) { Handle(TDocStd_Document) D; if (!DDocStd::GetDocument(a[1],D)) return 1; - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); if (!D->IsSaved()) { di << "this document has never been saved\n"; return 0; @@ -242,8 +238,7 @@ static Standard_Integer DDocStd_SaveAs (Draw_Interpretor& di, Handle(TDocStd_Document) D; if (!DDocStd::GetDocument(a[1],D)) return 1; TCollection_ExtendedString path (a[2]); - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); PCDM_StoreStatus theStatus; Standard_Boolean anUseStream = Standard_False; @@ -341,11 +336,7 @@ static Standard_Integer DDocStd_Close (Draw_Interpretor& /*theDI*/, } } - Handle(TDocStd_Application) aDocApp; - if (!DDocStd::Find (aDocApp)) - { - return 1; - } + Handle(TDocStd_Application) aDocApp = DDocStd::GetApplication(); aDocApp->Close (aDoc); @@ -365,8 +356,7 @@ static Standard_Integer DDocStd_IsInSession (Draw_Interpretor& di, const char** a) { if (nb == 2) { - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); di << A->IsInSession(a[1]); return 0; } @@ -441,8 +431,7 @@ static Standard_Integer DDocStd_AddComment (Draw_Interpretor& di, Handle(TDocStd_Document) D; if (!DDocStd::GetDocument(a[1],D)) return 1; TCollection_ExtendedString comment (a[2]); -// Handle(TDocStd_Application) A; -// if (!DDocStd::Find(A)) return 1; +// Handle(TDocStd_Application) A = DDocStd::GetApplication(); // A->AddComment(D,comment); D->AddComment(comment); return 0; diff --git a/src/DPrsStd/DPrsStd.cxx b/src/DPrsStd/DPrsStd.cxx index c32f0ab91f..9662352b6d 100644 --- a/src/DPrsStd/DPrsStd.cxx +++ b/src/DPrsStd/DPrsStd.cxx @@ -30,13 +30,11 @@ #include #include -//#include // avoid warnings on 'extern "C"' functions returning C++ classes #ifdef _MSC_VER #pragma warning(4:4190) #endif -//static Handle(AppStdL_Application) stdApp; -static Handle(AppStd_Application) stdApp; + //======================================================================= //function : AllComands //purpose : @@ -48,82 +46,16 @@ void DPrsStd::AllCommands (Draw_Interpretor& theCommands) if (done) return; done = Standard_True; - // APPLICATION - if (stdApp.IsNull()) stdApp = new AppStd_Application ();//new AppStdL_Application (); - DPrsStd::AISPresentationCommands(theCommands); DPrsStd::AISViewerCommands(theCommands); //DPrsStd::BasicCommands(theCommands); } -//============================================================================== -// Found standard CAF Plugin -//============================================================================== -static Standard_Boolean FoundCAFPlugin () { - - // Define Environment Variable - - const char *plugin, *casroot, *standard; - plugin = getenv("CSF_PluginDefaults"); - standard = getenv("CSF_StandardDefaults"); - casroot = getenv("CASROOT"); - Standard_Boolean hasPlugin = Standard_False; - TCollection_AsciiString PluginName ; - if ( !plugin ) { - if ( casroot ) { - PluginName = TCollection_AsciiString (casroot); - PluginName+="/src/StdResource" ; - hasPlugin = Standard_True ; - } - } else { - PluginName = TCollection_AsciiString (plugin); - hasPlugin = Standard_True ; - } - if ( hasPlugin ) { - OSD_Path aPath ( PluginName ); - OSD_Directory aDir(aPath); - if ( aDir.Exists () ) { - TCollection_AsciiString PluginFileName = PluginName + "/Plugin" ; - OSD_File PluginFile ( PluginFileName ); - if ( PluginFile.Exists() ) { - if (!plugin) { - OSD_Environment PluginEnv ( "CSF_PluginDefaults" , PluginName ); - PluginEnv.Build(); - if ( PluginEnv.Failed() ) { - cout << " Problem when initialise CSF_PluginDefaults whith " << PluginName.ToCString() << endl; - } - } - if (!standard) { - OSD_Environment StandardEnv ( "CSF_StandardDefaults" , PluginName ); - StandardEnv .Build(); - if ( StandardEnv.Failed() ) { - cout << " Problem when initialise CSF_StandardDefaults whith " << PluginName.ToCString() << endl; - } - } - } else { - hasPlugin = Standard_False; - } - } else { - hasPlugin = Standard_False; - } - } - - if ( !hasPlugin ) { - cout << " an environement variable named : CSF_PluginDefaults is mandatory to use OCAF " < -#include -#include -#include -#include - -PLUGIN(FWOSDriver) - -const Handle(Standard_Transient)& FWOSDriver::Factory(const Standard_GUID& /*aGUID*/) { - static Handle(Standard_Transient) f; - if(f.IsNull()) f = new FWOSDriver_DriverFactory; - return f; -} diff --git a/src/FWOSDriver/FWOSDriver.hxx b/src/FWOSDriver/FWOSDriver.hxx deleted file mode 100644 index 5b73afa4ca..0000000000 --- a/src/FWOSDriver/FWOSDriver.hxx +++ /dev/null @@ -1,64 +0,0 @@ -// Created on: 1997-01-22 -// Created by: Mister rmi -// Copyright (c) 1997-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _FWOSDriver_HeaderFile -#define _FWOSDriver_HeaderFile - -#include -#include -#include - -class Standard_Transient; -class Standard_GUID; -class FWOSDriver_DriverFactory; - - - -class FWOSDriver -{ -public: - - DEFINE_STANDARD_ALLOC - - - //! returns a DriverFactory. - Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& aGUID); - - - - -protected: - - - - - -private: - - - - -friend class FWOSDriver_DriverFactory; - -}; - - - - - - - -#endif // _FWOSDriver_HeaderFile diff --git a/src/FWOSDriver/FWOSDriver_DriverFactory.cxx b/src/FWOSDriver/FWOSDriver_DriverFactory.cxx deleted file mode 100644 index 18f4ab3a67..0000000000 --- a/src/FWOSDriver/FWOSDriver_DriverFactory.cxx +++ /dev/null @@ -1,31 +0,0 @@ -// Created on: 1997-03-04 -// Created by: Mister rmi -// Copyright (c) 1997-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - - -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(FWOSDriver_DriverFactory,CDF_MetaDataDriverFactory) - -FWOSDriver_DriverFactory::FWOSDriver_DriverFactory(){} - - -Handle(CDF_MetaDataDriver) FWOSDriver_DriverFactory::Build() const { - static Handle(CDF_FWOSDriver) d = new CDF_FWOSDriver(); - return d; -} diff --git a/src/FWOSDriver/FWOSDriver_DriverFactory.hxx b/src/FWOSDriver/FWOSDriver_DriverFactory.hxx deleted file mode 100644 index 2305300dc4..0000000000 --- a/src/FWOSDriver/FWOSDriver_DriverFactory.hxx +++ /dev/null @@ -1,64 +0,0 @@ -// Created on: 1997-03-04 -// Created by: Mister rmi -// Copyright (c) 1997-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _FWOSDriver_DriverFactory_HeaderFile -#define _FWOSDriver_DriverFactory_HeaderFile - -#include -#include - -#include -class CDF_MetaDataDriver; - - -class FWOSDriver_DriverFactory; -DEFINE_STANDARD_HANDLE(FWOSDriver_DriverFactory, CDF_MetaDataDriverFactory) - - -class FWOSDriver_DriverFactory : public CDF_MetaDataDriverFactory -{ - -public: - - - Standard_EXPORT FWOSDriver_DriverFactory(); - - Standard_EXPORT Handle(CDF_MetaDataDriver) Build() const Standard_OVERRIDE; - - - - - DEFINE_STANDARD_RTTIEXT(FWOSDriver_DriverFactory,CDF_MetaDataDriverFactory) - -protected: - - - - -private: - - - - -}; - - - - - - - -#endif // _FWOSDriver_DriverFactory_HeaderFile diff --git a/src/FWOSPlugin/CMakeLists.txt b/src/FWOSPlugin/CMakeLists.txt deleted file mode 100644 index 8032c3d4e7..0000000000 --- a/src/FWOSPlugin/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -project(FWOSPlugin) - -set (TOOLKIT_MODULES - FWOSDriver -) - -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/FWOSPlugin/EXTERNLIB b/src/FWOSPlugin/EXTERNLIB deleted file mode 100755 index 4bd793d9ad..0000000000 --- a/src/FWOSPlugin/EXTERNLIB +++ /dev/null @@ -1,2 +0,0 @@ -TKernel -TKCDF diff --git a/src/FWOSPlugin/FILES b/src/FWOSPlugin/FILES deleted file mode 100755 index ee6f7057f7..0000000000 --- a/src/FWOSPlugin/FILES +++ /dev/null @@ -1 +0,0 @@ -EXTERNLIB diff --git a/src/FWOSPlugin/PACKAGES b/src/FWOSPlugin/PACKAGES deleted file mode 100755 index 5811626e91..0000000000 --- a/src/FWOSPlugin/PACKAGES +++ /dev/null @@ -1 +0,0 @@ -FWOSDriver diff --git a/src/OS/ApplicationFramework.tcl b/src/OS/ApplicationFramework.tcl index 40b982029f..2d871417b0 100644 --- a/src/OS/ApplicationFramework.tcl +++ b/src/OS/ApplicationFramework.tcl @@ -24,7 +24,6 @@ proc ApplicationFramework:toolkits { } { TKXmlL \ TKBin \ TKXml \ - FWOSPlugin \ TKStdL \ TKStd \ TKTObj \ diff --git a/src/PCDM/PCDM.cxx b/src/PCDM/PCDM.cxx index 468de93b95..db24d1be22 100644 --- a/src/PCDM/PCDM.cxx +++ b/src/PCDM/PCDM.cxx @@ -32,34 +32,6 @@ #include #include -//======================================================================= -//function : StorageDriver -//purpose : gets in the EuclidDesktop resource the plugin -// identifier of the driver plugs the driver. -//======================================================================= -Handle(PCDM_StorageDriver) PCDM::StorageDriver(const Handle(CDM_Document)& aDocument) { - - if(!PCDM::FindStorageDriver(aDocument)) { - Standard_SStream aMsg; aMsg << "could not find the storage driver plugin resource for the format: " << aDocument->StorageFormat()<<(char) 0; - Standard_NoSuchObject::Raise(aMsg); - } - //return Handle(PCDM_StorageDriver)::DownCast(Plugin::Load(aDocument->StoragePlugin())); - Handle(PCDM_StorageDriver) DRIVER = - Handle(PCDM_StorageDriver)::DownCast(Plugin::Load(aDocument->StoragePlugin())); - if (!DRIVER.IsNull()) DRIVER->SetFormat(aDocument->StorageFormat()); - return DRIVER; -} - -//======================================================================= -//function : FindStorageDriver -//purpose : -//======================================================================= - -Standard_Boolean PCDM::FindStorageDriver(const Handle(CDM_Document)& aDocument) { - - return aDocument->FindStoragePlugin(); -} - //======================================================================= //function : FileDriverType //purpose : diff --git a/src/PCDM/PCDM.hxx b/src/PCDM/PCDM.hxx index 4356da58cf..18ff8ab893 100644 --- a/src/PCDM/PCDM.hxx +++ b/src/PCDM/PCDM.hxx @@ -34,12 +34,6 @@ class TCollection_AsciiString; class PCDM { public: - Standard_EXPORT static Standard_Boolean FindStorageDriver (const Handle(CDM_Document)& aDocument); - - //! gets in the EuclidDesktop resource the plugin - //! identifier of the driver plugs the driver. - Standard_EXPORT static Handle(PCDM_StorageDriver) StorageDriver (const Handle(CDM_Document)& aDocument); - Standard_EXPORT static PCDM_TypeOfFileDriver FileDriverType (const TCollection_AsciiString& aFileName, PCDM_BaseDriverPointer& aBaseDriver); Standard_EXPORT static PCDM_TypeOfFileDriver FileDriverType (Standard_IStream& theIStream, PCDM_BaseDriverPointer& theBaseDriver); diff --git a/src/PCDM/PCDM_StorageDriver.cxx b/src/PCDM/PCDM_StorageDriver.cxx index 2438ebbb8f..8208664406 100644 --- a/src/PCDM/PCDM_StorageDriver.cxx +++ b/src/PCDM/PCDM_StorageDriver.cxx @@ -46,11 +46,6 @@ void PCDM_StorageDriver::Write(const Handle(CDM_Document)& aDocument, const TCol { Handle(Storage_Schema) theSchema = new Storage_Schema; - TColStd_SequenceOfExtendedString theExtensions; - aDocument->Extensions(theExtensions); - LoadExtensions(theSchema,theExtensions); - - Handle(Storage_Data) theData = new Storage_Data; static Standard_Boolean Failure; @@ -114,9 +109,6 @@ void PCDM_StorageDriver::Write (const Handle(CDM_Document)& /*aDocument*/, Stand { } -//void PCDM_StorageDriver::LoadExtensions(const Handle(Storage_Schema)& aSchema, const TColStd_SequenceOfExtendedString& Extensions) {} -void PCDM_StorageDriver::LoadExtensions(const Handle(Storage_Schema)& , const TColStd_SequenceOfExtendedString& ) {} - //Handle(PCDM_Document) PCDM_StorageDriver::Make(const Handle(CDM_Document)& aDocument) { Handle(PCDM_Document) PCDM_StorageDriver::Make(const Handle(CDM_Document)& ) { diff --git a/src/PCDM/PCDM_StorageDriver.hxx b/src/PCDM/PCDM_StorageDriver.hxx index 8db3c8b281..6e21f78d38 100644 --- a/src/PCDM/PCDM_StorageDriver.hxx +++ b/src/PCDM/PCDM_StorageDriver.hxx @@ -64,10 +64,6 @@ public: //! by the previous Make method. Standard_EXPORT virtual void Make (const Handle(CDM_Document)& aDocument, PCDM_SequenceOfDocument& Documents); - Standard_EXPORT virtual TCollection_ExtendedString SchemaName() const = 0; - - Standard_EXPORT virtual void LoadExtensions (const Handle(Storage_Schema)& aSchema, const TColStd_SequenceOfExtendedString& Extensions); - //! Warning! raises DriverError if an error occurs during inside the //! Make method. //! stores the content of the Document into a new file. diff --git a/src/Plugin/Plugin.cxx b/src/Plugin/Plugin.cxx index 069b7cfc28..182e69d388 100644 --- a/src/Plugin/Plugin.cxx +++ b/src/Plugin/Plugin.cxx @@ -48,14 +48,11 @@ Handle(Standard_Transient) Plugin::Load (const Standard_GUID& aGUID, theResource += ".Location"; if(!PluginResource->Find(theResource.ToCString())) { - PluginResource = AdditionalPluginMap(); - if (!PluginResource->Find(theResource.ToCString())) { - Standard_SStream aMsg; aMsg << "could not find the resource:"; - aMsg << theResource.ToCString()<< endl; - if (theVerbose) - cout << "could not find the resource:"<SetResource ("ad696000-5b34-11d1-b5ba-00a0c9064368.Location", "TKStdSchema"); - Standard_EXPORT static const Handle(Resource_Manager)& AdditionalPluginMap(); - - - - -protected: - - - - - -private: - - - - - + Standard_EXPORT static Handle(Standard_Transient) Load (const Standard_GUID& aGUID, const Standard_Boolean theVerbose = Standard_True); }; - - - - - - #endif // _Plugin_HeaderFile diff --git a/src/QABugs/QABugs_1.cxx b/src/QABugs/QABugs_1.cxx index dda08524c2..1f326ddd13 100644 --- a/src/QABugs/QABugs_1.cxx +++ b/src/QABugs/QABugs_1.cxx @@ -202,8 +202,7 @@ static Standard_Integer OCC159bug (Draw_Interpretor& di, Standard_Integer argc, di << "DocOwner1 = NOTNULL\n"; } - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); A->Close(D); Handle(Draw_Drawable3D) DD = Draw::Get(argv[1],Standard_False); diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx index 5c7404a66b..7137145743 100644 --- a/src/QABugs/QABugs_11.cxx +++ b/src/QABugs/QABugs_11.cxx @@ -767,8 +767,7 @@ static Standard_Integer OCC381_Save (Draw_Interpretor& di, Standard_Integer nb, Handle(TDocStd_Document) D; if (!DDocStd::GetDocument(a[1],D)) return 1; - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); TCollection_ExtendedString theStatusMessage; if (!D->IsSaved()) { @@ -821,8 +820,7 @@ static Standard_Integer OCC381_SaveAs (Draw_Interpretor& di, Standard_Integer nb if (!DDocStd::GetDocument(a[1],D)) return 1; TCollection_ExtendedString path (a[2]); - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); TCollection_ExtendedString theStatusMessage; PCDM_StoreStatus theStatus = A->SaveAs(D,path, theStatusMessage); @@ -1065,8 +1063,7 @@ static Standard_Integer OCC363 (Draw_Interpretor& di, Standard_Integer argc, con if(argc < 3) { di <<"Error OCC363 : Use : OCC363 document filename\n"; return 1; } // 2. Retrieve DDocStd application - Handle(TDocStd_Application) App; - if (!DDocStd::Find(App)) { di << "Error OCC363 : There is no current DDocStd application\n";return 1;} + Handle(TDocStd_Application) App = DDocStd::GetApplication(); // 3. Open document TCollection_ExtendedString name(argv[2]); diff --git a/src/QABugs/QABugs_18.cxx b/src/QABugs/QABugs_18.cxx index 6d97a002ab..46da3ceb93 100644 --- a/src/QABugs/QABugs_18.cxx +++ b/src/QABugs/QABugs_18.cxx @@ -55,8 +55,7 @@ static Standard_Integer OCC267 (Draw_Interpretor& di, Standard_Integer argc, con Handle(TDocStd_Document) D; if (!DDocStd::GetDocument(argv[1],D)) return 1; TCollection_ExtendedString path (argv[2]); - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); PCDM_StoreStatus theStatus = A->SaveAs(D,path); if (theStatus == PCDM_SS_OK ) { diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 7b31fc9ec9..73f2e49639 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -52,11 +52,12 @@ #include #include #include - #include #include #include +#include +#include #define QCOMPARE(val1, val2) \ di << "Checking " #val1 " == " #val2 << \ @@ -201,16 +202,16 @@ static Standard_Integer OCC22980 (Draw_Interpretor& di, Standard_Integer /*argc* } #include -#include #include #include #include #include #include +#include static Standard_Integer OCC23595 (Draw_Interpretor& di, Standard_Integer /*argc*/, const char** /*argv*/) { - Handle(TDocStd_Application) anApp = XCAFApp_Application::GetApplication(); + Handle(TDocStd_Application) anApp = DDocStd::GetApplication(); Handle(TDocStd_Document) aDoc; anApp->NewDocument ("XmlXCAF", aDoc); QCOMPARE (!aDoc.IsNull(), Standard_True); @@ -1936,7 +1937,6 @@ static TopoDS_Shape CreateTestShape (int& theShapeNb) return aComp; } -#include #include #include static Standard_Integer OCC24931 (Draw_Interpretor& di, Standard_Integer argc, const char** argv) @@ -1948,7 +1948,7 @@ static Standard_Integer OCC24931 (Draw_Interpretor& di, Standard_Integer argc, c TCollection_ExtendedString aFileName (argv[1]); PCDM_StoreStatus aSStatus = PCDM_SS_Failure; - Handle(TDocStd_Application) anApp = new AppStd_Application; + Handle(TDocStd_Application) anApp = DDocStd::GetApplication(); { Handle(TDocStd_Document) aDoc; anApp->NewDocument ("XmlOcaf", aDoc); @@ -1966,9 +1966,6 @@ static Standard_Integer OCC24931 (Draw_Interpretor& di, Standard_Integer argc, c return 0; } -#include -#include -#include #include //======================================================================= //function : OCC24755 @@ -1982,7 +1979,7 @@ static Standard_Integer OCC24755 (Draw_Interpretor& di, Standard_Integer n, cons return 1; } - Handle(TDocStd_Application) anApp = new AppStdL_Application; + Handle(TDocStd_Application) anApp = DDocStd::GetApplication(); Handle(TDocStd_Document) aDoc; anApp->NewDocument ("BinOcaf", aDoc); TDF_Label aLab = aDoc->Main(); @@ -2288,32 +2285,24 @@ class Test_TDocStd_Application : public TDocStd_Application { public: - static void initGlobalPluginMap (const TCollection_AsciiString& thePlugin, - const TCollection_AsciiString& theSaver, - const TCollection_AsciiString& theLoader) + Test_TDocStd_Application () { - const Handle(Resource_Manager)& aManager = Plugin::AdditionalPluginMap(); - aManager->SetResource ((theSaver + ".Location").ToCString(), thePlugin.ToCString()); - aManager->SetResource ((theLoader + ".Location").ToCString(), thePlugin.ToCString()); - } - - Test_TDocStd_Application (const TCollection_AsciiString& thePlugin, - const TCollection_AsciiString& theSaver, - const TCollection_AsciiString& theLoader) - { - initGlobalPluginMap (thePlugin, theSaver, theLoader); - // explicitly initialize resource manager myResources = new Resource_Manager (""); myResources->SetResource ("xml.FileFormat", THE_QATEST_DOC_FORMAT); myResources->SetResource (THE_QATEST_DOC_FORMAT ".Description", "Test XML Document"); myResources->SetResource (THE_QATEST_DOC_FORMAT ".FileExtension", "xml"); - myResources->SetResource (THE_QATEST_DOC_FORMAT ".StoragePlugin", theSaver.ToCString()); - myResources->SetResource (THE_QATEST_DOC_FORMAT ".RetrievalPlugin", theLoader.ToCString()); } - virtual Standard_CString ResourcesName() { return ""; } - virtual void Formats (TColStd_SequenceOfExtendedString& theFormats) { theFormats.Clear(); } + virtual Handle(PCDM_Reader) ReaderFromFormat (const TCollection_ExtendedString&) Standard_OVERRIDE + { + return new XmlDrivers_DocumentRetrievalDriver (); + } + virtual Handle(PCDM_StorageDriver) WriterFromFormat (const TCollection_ExtendedString&) Standard_OVERRIDE + { + return new XmlDrivers_DocumentStorageDriver ("Test"); + } + virtual Standard_CString ResourcesName() Standard_OVERRIDE { return ""; } }; //======================================================================= @@ -2347,7 +2336,7 @@ static Standard_Integer OCC24925 (Draw_Interpretor& theDI, PCDM_StoreStatus aSStatus = PCDM_SS_Failure; PCDM_ReaderStatus aRStatus = PCDM_RS_OpenError; - Handle(TDocStd_Application) anApp = new Test_TDocStd_Application (aPlugin, aSaver, aLoader); + Handle(TDocStd_Application) anApp = new Test_TDocStd_Application (); { Handle(TDocStd_Document) aDoc; anApp->NewDocument (THE_QATEST_DOC_FORMAT, aDoc); @@ -2460,46 +2449,6 @@ static Standard_Integer OCC24606 (Draw_Interpretor& theDI, return 0; } -//======================================================================= -//function : OCC23010 -//purpose : -//======================================================================= -#include - -class mOcafApplication : public TDocStd_Application -{ - void Formats(TColStd_SequenceOfExtendedString& Formats) - { - Formats.Append(TCollection_ExtendedString("mOcafApplication")); - } - Standard_CString ResourcesName() - { - return Standard_CString("Resources"); - } -}; - -static Standard_Integer OCC23010 (Draw_Interpretor& di, Standard_Integer argc, const char ** argv) -{ - if (argc != 2) { - di << "Usage: " << argv[0] << " invalid number of arguments\n"; - return 1; - } - std::string fileName=argv[1]; - mOcafApplication *mCasApp = new mOcafApplication(); - Handle(TDocStd_Document) doc; - mCasApp->NewDocument("BinXCAF", doc); - STEPCAFControl_Reader stepReader; - IFSelect_ReturnStatus status = stepReader.ReadFile (fileName.c_str()); - if (status != IFSelect_RetDone) - return false; - stepReader.SetColorMode(Standard_True); - stepReader.SetLayerMode(Standard_True); - stepReader.SetNameMode(Standard_True); - stepReader.Transfer(doc); // ERROR HERE!!! - delete mCasApp; - return 0; -} - //======================================================================= //function : OCC25202 //purpose : @@ -5280,7 +5229,6 @@ void QABugs::Commands_19(Draw_Interpretor& theCommands) { "OCC24925 filename [pluginLib=TKXml storageGuid retrievalGuid]" "\nOCAF persistence without setting environment variables", __FILE__, OCC24925, group); - theCommands.Add ("OCC23010", "OCC23010 STEP_file", __FILE__, OCC23010, group); theCommands.Add ("OCC25043", "OCC25043 shape", __FILE__, OCC25043, group); theCommands.Add ("OCC24826,", "This test performs simple saxpy test.\n Usage: OCC24826 length", __FILE__, OCC24826, group); theCommands.Add ("OCC24606", "OCC24606 : Tests ::FitAll for V3d view ('vfit' is for NIS view)", __FILE__, OCC24606, group); diff --git a/src/QABugs/QABugs_3.cxx b/src/QABugs/QABugs_3.cxx index 9101db347a..f6f64540b9 100644 --- a/src/QABugs/QABugs_3.cxx +++ b/src/QABugs/QABugs_3.cxx @@ -1558,8 +1558,7 @@ static int BUC60862(Draw_Interpretor& di, Standard_Integer argc, const char ** a static int BUC60867(Draw_Interpretor& di, Standard_Integer argc, const char ** argv) { if (argc == 2) { TCollection_ExtendedString path (argv[1]); - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) {di<<1;return 0;} + Handle(TDocStd_Application) A = DDocStd::GetApplication(); Handle(TDocStd_Document) D; Standard_Integer insession = A->IsInSession(path); if (insession > 0) { diff --git a/src/StdDrivers/StdDrivers.cxx b/src/StdDrivers/StdDrivers.cxx index 32e8bf84a7..2aed18c190 100644 --- a/src/StdDrivers/StdDrivers.cxx +++ b/src/StdDrivers/StdDrivers.cxx @@ -24,6 +24,9 @@ #include #include +#include +#include + static Standard_GUID StdRetrievalDriver ("ad696001-5b34-11d1-b5ba-00a0c9064368"); //======================================================================= @@ -47,6 +50,16 @@ Handle(Standard_Transient) StdDrivers::Factory (const Standard_GUID& aGUID) return NULL; } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void StdDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("MDTV-Standard", "Standard OCAF Document", "std", + new StdDrivers_DocumentRetrievalDriver, 0); +} + //======================================================================= //function : BindTypes //purpose : Register types diff --git a/src/StdDrivers/StdDrivers.hxx b/src/StdDrivers/StdDrivers.hxx index efd48fe00a..6ff9407183 100644 --- a/src/StdDrivers/StdDrivers.hxx +++ b/src/StdDrivers/StdDrivers.hxx @@ -14,28 +14,26 @@ #ifndef _StdDrivers_HeaderFile #define _StdDrivers_HeaderFile -#include -#include #include class Standard_Transient; class Standard_GUID; class StdObjMgt_MapOfInstantiators; - +class TDocStd_Application; class StdDrivers { - friend class StdDrivers_DocumentRetrievalDriver; - public: //! Depending from the ID, returns a list of storage //! or retrieval attribute drivers. Used for plugin Standard_EXPORT static Handle(Standard_Transient) Factory (const Standard_GUID& aGUID); + //! Defines format "MDTV-Standard" and registers its retrieval driver + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + //! Register types. Standard_EXPORT static void BindTypes (StdObjMgt_MapOfInstantiators& theMap); - - DEFINE_STANDARD_ALLOC }; #endif // _StdDrivers_HeaderFile diff --git a/src/StdLDrivers/StdLDrivers.cxx b/src/StdLDrivers/StdLDrivers.cxx index 73fcdfd1d8..547b9bdda7 100644 --- a/src/StdLDrivers/StdLDrivers.cxx +++ b/src/StdLDrivers/StdLDrivers.cxx @@ -21,6 +21,9 @@ #include #include +#include +#include + static Standard_GUID StdLRetrievalDriver ("bd696001-5b34-11d1-b5ba-00a0c9064368"); //======================================================================= @@ -44,6 +47,16 @@ Handle(Standard_Transient) StdLDrivers::Factory (const Standard_GUID& aGUID) return NULL; } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void StdLDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("OCC-StdLite", "Lite OCAF Document", "stdl", + new StdLDrivers_DocumentRetrievalDriver, 0); +} + //======================================================================= //function : BindTypes //purpose : Register types diff --git a/src/StdLDrivers/StdLDrivers.hxx b/src/StdLDrivers/StdLDrivers.hxx index 1db43de441..64abc359bc 100644 --- a/src/StdLDrivers/StdLDrivers.hxx +++ b/src/StdLDrivers/StdLDrivers.hxx @@ -14,28 +14,26 @@ #ifndef _StdLDrivers_HeaderFile #define _StdLDrivers_HeaderFile -#include -#include #include class Standard_Transient; class Standard_GUID; class StdObjMgt_MapOfInstantiators; - +class TDocStd_Application; class StdLDrivers { - friend class StdLDrivers_DocumentRetrievalDriver; - public: //! Depending from the ID, returns a list of storage //! or retrieval attribute drivers. Used for plugin Standard_EXPORT static Handle(Standard_Transient) Factory (const Standard_GUID& aGUID); + //! Defines format "OCC-StdLite" and registers its retrieval driver + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + //! Register types. Standard_EXPORT static void BindTypes (StdObjMgt_MapOfInstantiators& theMap); - - DEFINE_STANDARD_ALLOC }; #endif // _StdLDrivers_HeaderFile diff --git a/src/StdResource/Plugin b/src/StdResource/Plugin index b346df48f4..56ec8dac5b 100755 --- a/src/StdResource/Plugin +++ b/src/StdResource/Plugin @@ -1,8 +1,6 @@ ! Description of available plugins ! ******************************** ! -a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin -! ! standard attribute drivers plugin ! ad696001-5b34-11d1-b5ba-00a0c9064368.Location: TKStd diff --git a/src/Storage/Storage_Schema.cxx b/src/Storage/Storage_Schema.cxx index 2167cabaee..3d2bb4de56 100644 --- a/src/Storage/Storage_Schema.cxx +++ b/src/Storage/Storage_Schema.cxx @@ -768,10 +768,24 @@ Standard_Boolean Storage_Schema::CheckTypeMigration( aValue = aLine.Token(" \t\n\r", 2); aDMap.Bind(aKey, aValue); } - } + } + } + else + { + // hard-code migration table for known types + aDMap.Bind("TDataStd_Shape", "TDataXtd_Shape"); + aDMap.Bind("TDataStd_Constraint", "TDataXtd_Constraint"); + aDMap.Bind("TDataStd_Geometry", "TDataXtd_Geometry"); + aDMap.Bind("TDataStd_Axis", "TDataXtd_Axis"); + aDMap.Bind("TDataStd_Point", "TDataXtd_Point"); + aDMap.Bind("TDataStd_Plane", "TDataXtd_Plane"); + aDMap.Bind("TDataStd_Position", "TDataXtd_Position"); + aDMap.Bind("TDataStd_Placement", "TDataXtd_Placement"); + aDMap.Bind("TDataStd_PatternStd", "TDataXtd_PatternStd"); + aDMap.Bind("TPrsStd_AISPresentation", "TDataXtd_Presentation"); } #ifdef OCCT_DEBUG - cout << "Storage_Sheme:: aDataMap.Size = " << aDMap.Extent() <SetResource ((theFormat + ".Description" ).ToCString(), theDescription.ToCString()); + aResources->SetResource ((theFormat + ".FileExtension").ToCString(), theExtension.ToCString()); + aResources->SetResource ((theExtension + ".FileFormat").ToCString(), theFormat.ToCString()); + + // set format ID in the drivers to allow them putting it in + // the OCAF documents opened by these drivers + if (!theReader.IsNull()) + theReader->SetFormat(theFormat); + if (!theWriter.IsNull()) + theWriter->SetFormat(theFormat); + + // register drivers + myReaders.Bind (theFormat, theReader); + myWriters.Bind (theFormat, theWriter); +} //======================================================================= //function : NbDocuments @@ -309,44 +358,35 @@ PCDM_StoreStatus TDocStd_Application::SaveAs(const Handle(TDocStd_Document)& D,c //======================================================================= PCDM_StoreStatus TDocStd_Application::SaveAs (const Handle(TDocStd_Document)& theDoc, Standard_OStream& theOStream) { - PCDM_StoreStatus aStatus = PCDM_SS_Failure; - - if (theDoc->FindStoragePlugin()) + try { - try + Handle(PCDM_StorageDriver) aDocStorageDriver = WriterFromFormat(theDoc->StorageFormat()); + + if (aDocStorageDriver.IsNull()) { - Handle(PCDM_StorageDriver) aDocStorageDriver = - Handle(PCDM_StorageDriver)::DownCast (Plugin::Load(theDoc->StoragePlugin())); - - if (!aDocStorageDriver.IsNull()) - { - aDocStorageDriver->SetFormat (theDoc->StorageFormat()); - aDocStorageDriver->Write (theDoc,theOStream); - - if (aDocStorageDriver->GetStoreStatus() == PCDM_SS_OK) - { - theDoc->SetSaved(); - } - - aStatus = aDocStorageDriver->GetStoreStatus(); - } + return PCDM_SS_DriverFailure; } - catch (Standard_Failure) + + aDocStorageDriver->SetFormat(theDoc->StorageFormat()); + aDocStorageDriver->Write(theDoc, theOStream); + + if (aDocStorageDriver->GetStoreStatus() == PCDM_SS_OK) { - Handle(Standard_Failure) aFailure = Standard_Failure::Caught(); - if (!aFailure.IsNull() && !MessageDriver().IsNull()) - { - TCollection_ExtendedString aString (aFailure->GetMessageString()); - MessageDriver()->Write(aString.ToExtString()); - } + theDoc->SetSaved(); + } + + return aDocStorageDriver->GetStoreStatus(); + } + catch (Standard_Failure) + { + Handle(Standard_Failure) aFailure = Standard_Failure::Caught(); + if (!aFailure.IsNull() && !MessageDriver().IsNull()) + { + TCollection_ExtendedString aString(aFailure->GetMessageString()); + MessageDriver()->Write(aString.ToExtString()); } } - else - { - aStatus = PCDM_SS_DriverFailure; - } - - return aStatus; + return PCDM_SS_Failure; } //======================================================================= @@ -385,32 +425,6 @@ PCDM_StoreStatus TDocStd_Application::Save (const Handle(TDocStd_Document)& D) { return status; } -//======================================================================= -//function : SetViewer -//purpose : -//======================================================================= - -// void TDocStd_Application::SetViewer(const Handle(TDocStd_Document)& D, -// const Handle(V3d_Viewer)& viewer) -// { -// TPrsStd_AISViewer::New (D->Main(),viewer); -// InitViewer(D); -// } - - -//======================================================================= -//function : SetViewer -//purpose : -//======================================================================= - -// void TDocStd_Application::SetViewer(const Handle(TDocStd_Document)& D, -// const Handle(AIS_InteractiveContext)& IC) -// { -// TPrsStd_AISViewer::New (D->Main(),IC); -// InitViewer(D); -// } - - //======================================================================= //function : SaveAs //purpose : @@ -463,45 +477,35 @@ PCDM_StoreStatus TDocStd_Application::SaveAs (const Handle(TDocStd_Document)& th Standard_OStream& theOStream, TCollection_ExtendedString& theStatusMessage) { - PCDM_StoreStatus aStatus = PCDM_SS_Failure; - - if (theDoc->FindStoragePlugin()) + try { - try + Handle(PCDM_StorageDriver) aDocStorageDriver = WriterFromFormat (theDoc->StorageFormat()); + if (aDocStorageDriver.IsNull()) { - Handle(PCDM_StorageDriver) aDocStorageDriver = - Handle(PCDM_StorageDriver)::DownCast (Plugin::Load(theDoc->StoragePlugin())); + theStatusMessage = TCollection_ExtendedString("TDocStd_Application::SaveAs: no storage driver"); + return PCDM_SS_DriverFailure; + } - if (!aDocStorageDriver.IsNull()) - { - aDocStorageDriver->SetFormat (theDoc->StorageFormat()); - aDocStorageDriver->Write (theDoc,theOStream); + aDocStorageDriver->SetFormat(theDoc->StorageFormat()); + aDocStorageDriver->Write(theDoc, theOStream); - if (aDocStorageDriver->GetStoreStatus() == PCDM_SS_OK) - { - theDoc->SetSaved(); - } - - aStatus = aDocStorageDriver->GetStoreStatus(); - } - } - catch (Standard_Failure) + if (aDocStorageDriver->GetStoreStatus() == PCDM_SS_OK) { - Handle(Standard_Failure) aFailure = Standard_Failure::Caught(); - if (!aFailure.IsNull() && !MessageDriver().IsNull()) - { - TCollection_ExtendedString aString (aFailure->GetMessageString()); - MessageDriver()->Write(aString.ToExtString()); - } + theDoc->SetSaved(); + } + + return aDocStorageDriver->GetStoreStatus(); + } + catch (Standard_Failure) + { + Handle(Standard_Failure) aFailure = Standard_Failure::Caught(); + if (!aFailure.IsNull() && !MessageDriver().IsNull()) + { + TCollection_ExtendedString aString(aFailure->GetMessageString()); + MessageDriver()->Write(aString.ToExtString()); } } - else - { - theStatusMessage = TCollection_ExtendedString("TDocStd_Application::sSaveAs: a storage plugin has not been found"); - aStatus = PCDM_SS_DriverFailure; - } - - return aStatus; + return PCDM_SS_Failure; } //======================================================================= diff --git a/src/TDocStd/TDocStd_Application.hxx b/src/TDocStd/TDocStd_Application.hxx index 355eed7ae2..6cdb9db10c 100644 --- a/src/TDocStd/TDocStd_Application.hxx +++ b/src/TDocStd/TDocStd_Application.hxx @@ -22,18 +22,19 @@ #include #include +#include #include #include #include #include #include #include + class Resource_Manager; class Standard_NoSuchObject; class TDocStd_Document; class TCollection_ExtendedString; - class TDocStd_Application; DEFINE_STANDARD_HANDLE(TDocStd_Application, CDF_Application) @@ -71,19 +72,45 @@ class TDocStd_Application : public CDF_Application public: + //! Constructs the new instance and registers it in CDM_Session + Standard_EXPORT TDocStd_Application(); //! Check if meta data driver was successfully loaded //! by the application constructor Standard_EXPORT Standard_Boolean IsDriverLoaded() const; + + //! Redefines message driver, by default outputs to cout. + Standard_EXPORT virtual Handle(CDM_MessageDriver) MessageDriver() Standard_OVERRIDE; - //! create (if not done) a Manager using ResourcesName - //! method. + //! Returns resource manager defining supported persistent formats. + //! + //! Default implementation loads resource file with name ResourcesName(), + //! unless field myResources is already initialized (either by + //! previous call or in any other way). + //! + //! The resource manager should define: + //! + //! * Format name for each file extension supported: + //! - [Extension].FileFormat: [Format] + //! + //! * For each format supported (as returned by Formats()), + //! its extension, description string, and (when applicable) + //! GUIDs of storage and retrieval plugins: + //! - [Format].Description: [Description] + //! - [Format].FileExtension: [Extension] + //! - [Format].RetrievalPlugin: [GUID] (optional) + //! - [Format].StoragePlugin: [GUID] (optional) Standard_EXPORT virtual Handle(Resource_Manager) Resources() Standard_OVERRIDE; //! Returns the name of the file containing the - //! resources of this application. - //! In a resource file, the application associates the schema name - //! of the document with the storage and + //! resources of this application, for support of legacy + //! method of loading formats data from resource files. + //! + //! Method DefineFormat() can be used to define all necessary + //! parameters explicitly without actually using resource files. + //! + //! In a resource file, the application associates the + //! schema name of the document with the storage and //! retrieval plug-ins that are to be loaded for each //! document. On retrieval, the application reads the //! schema name in the heading of the CSF file and @@ -102,7 +129,26 @@ public: //! functions should be redefined. In particular, you //! must redefine the abstract function Resources //! inherited from the superclass CDM_Application. - Standard_EXPORT virtual Standard_CString ResourcesName() = 0; + //! + //! Default implementation returns empty string. + Standard_EXPORT virtual Standard_CString ResourcesName(); + + //! Sets up resources and registers read and storage drivers for + //! the specified format. + //! + //! @param theFormat - unique name for the format, used to identify it. + //! @param theDescription - textual description of the format. + //! @param theExtension - extension of the files in that format. + //! The same extension can be used by several formats. + //! @param theReader - instance of the read driver for the format. + //! Null value is allowed (no possibility to read). + //! @param theWriter - instance of the write driver for the format. + //! Null value is allowed (no possibility to write). + Standard_EXPORT void DefineFormat (const TCollection_AsciiString& theFormat, + const TCollection_AsciiString& theDescription, + const TCollection_AsciiString& theExtension, + const Handle(PCDM_RetrievalDriver)& theReader, + const Handle(PCDM_StorageDriver)& theWriter); //! returns the number of documents handled by the current applicative session. Standard_EXPORT Standard_Integer NbDocuments() const; @@ -121,14 +167,6 @@ public: //! aApp->GetDocument(i,aDoc); Standard_EXPORT void GetDocument (const Standard_Integer index, Handle(TDocStd_Document)& aDoc) const; - - //! Returns the format name Formats - //! representing the format supported for - //! application documents. - //! This virtual function is to be redefined for each - //! specific application. - Standard_EXPORT virtual void Formats (TColStd_SequenceOfExtendedString& Formats) Standard_OVERRIDE = 0; - //! Constructs the empty new document aDoc. //! This document will have the format format. //! If InitDocument is redefined for a specific @@ -209,17 +247,6 @@ public: //! Save the document overwriting the previous file Standard_EXPORT PCDM_StoreStatus Save (const Handle(TDocStd_Document)& aDoc, TCollection_ExtendedString& theStatusMessage); - -friend class TDocStd_Document; - - - DEFINE_STANDARD_RTTIEXT(TDocStd_Application,CDF_Application) - -protected: - - - Standard_EXPORT TDocStd_Application(); - //! Notification that is fired at each OpenTransaction event. Standard_EXPORT virtual void OnOpenTransaction (const Handle(TDocStd_Document)& theDoc); @@ -229,21 +256,12 @@ protected: //! Notification that is fired at each AbortTransaction event. Standard_EXPORT virtual void OnAbortTransaction (const Handle(TDocStd_Document)& theDoc); + DEFINE_STANDARD_RTTIEXT(TDocStd_Application,CDF_Application) + +protected: + Handle(CDM_MessageDriver) myMessageDriver; Handle(Resource_Manager) myResources; Standard_Boolean myIsDriverLoaded; - - -private: - - - - }; - - - - - - #endif // _TDocStd_Application_HeaderFile diff --git a/src/TKDCAF/EXTERNLIB b/src/TKDCAF/EXTERNLIB index 4e73baabbc..db619c60f0 100755 --- a/src/TKDCAF/EXTERNLIB +++ b/src/TKDCAF/EXTERNLIB @@ -18,3 +18,9 @@ TKBO TKCAF TKVCAF TKViewerTest +TKStd +TKStdL +TKBin +TKBinL +TKXml +TKXmlL diff --git a/src/TKQADraw/EXTERNLIB b/src/TKQADraw/EXTERNLIB index 29172c3e32..bb588a05a2 100755 --- a/src/TKQADraw/EXTERNLIB +++ b/src/TKQADraw/EXTERNLIB @@ -32,6 +32,7 @@ TKSTEPBase TKXDESTEP TKXSDRAW TKSTL +TKXml CSF_gdi32 CSF_advapi32 CSF_user32 diff --git a/src/TKTObjDRAW/EXTERNLIB b/src/TKTObjDRAW/EXTERNLIB index 56dfd2d8db..0ca6745859 100755 --- a/src/TKTObjDRAW/EXTERNLIB +++ b/src/TKTObjDRAW/EXTERNLIB @@ -5,3 +5,5 @@ TKTObj TKMath TKDraw TKDCAF +TKBinTObj +TKXmlTObj diff --git a/src/TKXDEDRAW/EXTERNLIB b/src/TKXDEDRAW/EXTERNLIB index 6ee84b823c..85edbded0e 100755 --- a/src/TKXDEDRAW/EXTERNLIB +++ b/src/TKXDEDRAW/EXTERNLIB @@ -22,3 +22,5 @@ TKXDEIGES TKXDESTEP TKDCAF TKViewerTest +TKBinXCAF +TKXmlXCAF diff --git a/src/TObj/TObj_Application.cxx b/src/TObj/TObj_Application.cxx index e1f4a1e8d2..8b887f1864 100644 --- a/src/TObj/TObj_Application.cxx +++ b/src/TObj/TObj_Application.cxx @@ -23,8 +23,9 @@ #include #include #include -#include +#include +#include IMPLEMENT_STANDARD_RTTIEXT(TObj_Application,TDocStd_Application) @@ -47,21 +48,9 @@ Handle(TObj_Application) TObj_Application::GetInstance() TObj_Application::TObj_Application () : myIsError(Standard_False) { myMessenger = new Message_Messenger; - myMessageDriver = new CDM_COutMessageDriver; myIsVerbose = Standard_False; } -//======================================================================= -//function : Formats -//purpose : -//======================================================================= - -void TObj_Application::Formats(TColStd_SequenceOfExtendedString& theFormats) -{ - theFormats.Append(TCollection_ExtendedString ("TObjXml")); - theFormats.Append(TCollection_ExtendedString ("TObjBin")); -} - //======================================================================= //function : ResourcesName //purpose : diff --git a/src/TObj/TObj_Application.hxx b/src/TObj/TObj_Application.hxx index 6d7130e111..7d01d64693 100644 --- a/src/TObj/TObj_Application.hxx +++ b/src/TObj/TObj_Application.hxx @@ -89,13 +89,6 @@ public: //! Return name of resource (i.e. "TObj") virtual Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; - //! Return format (i.e "TObj") - virtual Standard_EXPORT void Formats(TColStd_SequenceOfExtendedString& theFormats) Standard_OVERRIDE; - - //! Defines message driver for CDM layer - virtual Standard_EXPORT Handle(CDM_MessageDriver) MessageDriver() Standard_OVERRIDE - { return myMessageDriver; } - protected: /** * Constructor @@ -113,7 +106,6 @@ public: Standard_Boolean myIsError; //!< error flag Standard_Boolean myIsVerbose; //!< verbose flag Handle(Message_Messenger) myMessenger; //!< messenger - Handle(CDM_MessageDriver) myMessageDriver; //!< message driver public: //! CASCADE RTTI diff --git a/src/TObj/TObj_Model.cxx b/src/TObj/TObj_Model.cxx index e7428c586b..2d6a52429e 100644 --- a/src/TObj/TObj_Model.cxx +++ b/src/TObj/TObj_Model.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/TObjDRAW/TObjDRAW.cxx b/src/TObjDRAW/TObjDRAW.cxx index 6aa6c667bd..f2f7170423 100644 --- a/src/TObjDRAW/TObjDRAW.cxx +++ b/src/TObjDRAW/TObjDRAW.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,9 @@ #include #include +#include +#include + #include // avoid warnings on 'extern "C"' functions returning C++ classes #ifdef _MSC_VER @@ -508,6 +512,16 @@ void TObjDRAW::Init(Draw_Interpretor& di) //============================================================================== void TObjDRAW::Factory(Draw_Interpretor& theDI) { + // Initialize TObj OCAF formats + Handle(TDocStd_Application) anApp = DDocStd::GetApplication(); + BinTObjDrivers::DefineFormat(anApp); + XmlTObjDrivers::DefineFormat(anApp); + + // define formats for TObj specific application + anApp = TObj_Application::GetInstance(); + BinTObjDrivers::DefineFormat(anApp); + XmlTObjDrivers::DefineFormat(anApp); + TObjDRAW::Init(theDI); #ifdef OCCT_DEBUG diff --git a/src/XCAFApp/XCAFApp_Application.cxx b/src/XCAFApp/XCAFApp_Application.cxx index 277117df46..a02d48aa11 100644 --- a/src/XCAFApp/XCAFApp_Application.cxx +++ b/src/XCAFApp/XCAFApp_Application.cxx @@ -14,7 +14,7 @@ // commercial license or contractual agreement. -#include +#include #include #include #include @@ -47,17 +47,6 @@ XCAFApp_Application::XCAFApp_Application() table->AddDriver (XCAFPrs_Driver::GetID(), new XCAFPrs_Driver); } -//======================================================================= -//function : Formats -//purpose : -//======================================================================= - -void XCAFApp_Application::Formats(TColStd_SequenceOfExtendedString& Formats) -{ - Formats.Append(TCollection_ExtendedString ("XmlXCAF")); - Formats.Append(TCollection_ExtendedString ("BinXCAF")); -} - //======================================================================= //function : ResourcesName //purpose : diff --git a/src/XCAFApp/XCAFApp_Application.hxx b/src/XCAFApp/XCAFApp_Application.hxx index 220f8e7d3b..ea9b93e5ba 100644 --- a/src/XCAFApp/XCAFApp_Application.hxx +++ b/src/XCAFApp/XCAFApp_Application.hxx @@ -34,9 +34,6 @@ class XCAFApp_Application : public TDocStd_Application public: - - Standard_EXPORT virtual void Formats (TColStd_SequenceOfExtendedString& Formats) Standard_OVERRIDE; - //! methods from TDocStd_Application //! ================================ Standard_EXPORT virtual Standard_CString ResourcesName() Standard_OVERRIDE; @@ -51,31 +48,11 @@ public: //! any actions with documents in order to init application Standard_EXPORT static Handle(XCAFApp_Application) GetApplication(); - - - DEFINE_STANDARD_RTTIEXT(XCAFApp_Application,TDocStd_Application) protected: - - //! methods from CDF_Application - //! ============================ Standard_EXPORT XCAFApp_Application(); - - - -private: - - - - }; - - - - - - #endif // _XCAFApp_Application_HeaderFile diff --git a/src/XCAFDoc/XCAFDoc.cxx b/src/XCAFDoc/XCAFDoc.cxx index 99b5f95ef1..e40e7b6cf0 100644 --- a/src/XCAFDoc/XCAFDoc.cxx +++ b/src/XCAFDoc/XCAFDoc.cxx @@ -18,7 +18,7 @@ #include #include #include - +#include //======================================================================= //function : ShapeRefGUID diff --git a/src/XDEDRAW/XDEDRAW.cxx b/src/XDEDRAW/XDEDRAW.cxx index 5405eac530..21368148a1 100644 --- a/src/XDEDRAW/XDEDRAW.cxx +++ b/src/XDEDRAW/XDEDRAW.cxx @@ -50,17 +50,18 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -89,6 +90,9 @@ #include #include +#include +#include + #include #define ZVIEW_SIZE 1000000.0 // avoid warnings on 'extern "C"' functions returning C++ classes @@ -110,9 +114,7 @@ static Standard_Integer newDoc (Draw_Interpretor& di, Standard_Integer argc, con Handle(TDocStd_Document) D; Handle(DDocStd_DrawDocument) DD; - Handle(TDocStd_Application) A; - - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); if (!DDocStd::GetDocument(argv[1],D,Standard_False)) { A->NewDocument( "BinXCAF" ,D); @@ -135,8 +137,7 @@ static Standard_Integer newDoc (Draw_Interpretor& di, Standard_Integer argc, con static Standard_Integer saveDoc (Draw_Interpretor& di, Standard_Integer argc, const char** argv) { Handle(TDocStd_Document) D; - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); if (argc == 1) { if (A->NbDocuments() < 1) return 1; @@ -167,10 +168,7 @@ static Standard_Integer openDoc (Draw_Interpretor& di, Standard_Integer argc, co { Handle(TDocStd_Document) D; Handle(DDocStd_DrawDocument) DD; - Handle(TDocStd_Application) A; - - if ( !DDocStd::Find(A) ) - return 1; + Handle(TDocStd_Application) A = DDocStd::GetApplication(); if ( argc != 3 ) { @@ -1026,10 +1024,10 @@ static Standard_Integer testDoc (Draw_Interpretor&, if( shape.IsNull()) return 1; - Handle(XCAFApp_Application) A = XCAFApp_Application::GetApplication(); + Handle(TDocStd_Application) anApp = DDocStd::GetApplication(); Handle(TDocStd_Document) aD1 = new TDocStd_Document("BinXCAF"); - aD1->Open(A); + aD1->Open(anApp); TCollection_AsciiString aViewName ("Driver1/DummyDocument/View1"); ViewerTest::ViewerInit (0, 0, 0, 0, aViewName.ToCString(), ""); @@ -1076,19 +1074,14 @@ void XDEDRAW::Init(Draw_Interpretor& di) // Load static variables for STEPCAF (ssv; 16.08.2012) STEPCAFControl_Controller::Init(); - // OCAF *** szy: use command + // Initialize XCAF formats + Handle(TDocStd_Application) anApp = DDocStd::GetApplication(); + BinXCAFDrivers::DefineFormat(anApp); + XmlXCAFDrivers::DefineFormat(anApp); -// DDF::AllCommands(di); -// DNaming::AllCommands(di); -// DDataStd::AllCommands(di); -// DPrsStd::AllCommands(di); - //DFunction::AllCommands(di); -// DDocStd::AllCommands(di); - -// ViewerTest::Commands (di); *** szy: use command - - // init XCAF application (if not yet done) - XCAFApp_Application::GetApplication(); + // Register driver in global table for displaying XDE documents + // in 3d viewer using OCAF mechanics + TPrsStd_DriverTable::Get()->AddDriver (XCAFPrs_Driver::GetID(), new XCAFPrs_Driver); //===================================== // General commands diff --git a/src/XDEDRAW/XDEDRAW_Common.cxx b/src/XDEDRAW/XDEDRAW_Common.cxx index d0aa39246c..5c1a5f8f83 100644 --- a/src/XDEDRAW/XDEDRAW_Common.cxx +++ b/src/XDEDRAW/XDEDRAW_Common.cxx @@ -225,8 +225,7 @@ static Standard_Integer ReadIges (Draw_Interpretor& di, Standard_Integer argc, c Handle(TDocStd_Document) doc; if (!DDocStd::GetDocument(argv[1],doc,Standard_False)) { - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) {di<<"No application found\n";return 1;} + Handle(TDocStd_Application) A = DDocStd::GetApplication(); A->NewDocument("BinXCAF",doc); TDataStd_Name::Set(doc->GetData()->Root(),argv[1]); Handle(DDocStd_DrawDocument) DD = new DDocStd_DrawDocument(doc); @@ -336,8 +335,7 @@ static Standard_Integer ReadStep (Draw_Interpretor& di, Standard_Integer argc, c Handle(TDocStd_Document) doc; if (!DDocStd::GetDocument(argv[1],doc,Standard_False)) { - Handle(TDocStd_Application) A; - if (!DDocStd::Find(A)) {di<<"No application found\n";return 1;} + Handle(TDocStd_Application) A = DDocStd::GetApplication(); A->NewDocument("BinXCAF",doc); TDataStd_Name::Set(doc->GetData()->Root(),argv[1]); Handle(DDocStd_DrawDocument) DD = new DDocStd_DrawDocument(doc); diff --git a/src/XmlDrivers/XmlDrivers.cxx b/src/XmlDrivers/XmlDrivers.cxx index 45436059d9..59b3cec8fb 100644 --- a/src/XmlDrivers/XmlDrivers.cxx +++ b/src/XmlDrivers/XmlDrivers.cxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,6 +66,17 @@ const Handle(Standard_Transient)& XmlDrivers::Factory(const Standard_GUID& theGU return aNullHandle; } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void XmlDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("XmlOcaf", "Xml OCAF Document", "xml", + new XmlDrivers_DocumentRetrievalDriver, + new XmlDrivers_DocumentStorageDriver ("Copyright: Open Cascade, 2001-2002")); +} + //======================================================================= //function : AttributeDrivers //purpose : diff --git a/src/XmlDrivers/XmlDrivers.hxx b/src/XmlDrivers/XmlDrivers.hxx index d8e019fb1a..f29da26c74 100644 --- a/src/XmlDrivers/XmlDrivers.hxx +++ b/src/XmlDrivers/XmlDrivers.hxx @@ -16,8 +16,6 @@ #ifndef _XmlDrivers_HeaderFile #define _XmlDrivers_HeaderFile -#include -#include #include class Standard_Transient; @@ -26,43 +24,18 @@ class XmlMDF_ADriverTable; class CDM_MessageDriver; class XmlDrivers_DocumentStorageDriver; class XmlDrivers_DocumentRetrievalDriver; - - +class TDocStd_Application; class XmlDrivers { public: - - DEFINE_STANDARD_ALLOC - - Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& theGUID); + //! Defines format "XmlOcaf" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + Standard_EXPORT static Handle(XmlMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver); - - - - -protected: - - - - - -private: - - - - -friend class XmlDrivers_DocumentStorageDriver; -friend class XmlDrivers_DocumentRetrievalDriver; - }; - - - - - - #endif // _XmlDrivers_HeaderFile diff --git a/src/XmlLDrivers/XmlLDrivers.cxx b/src/XmlLDrivers/XmlLDrivers.cxx index dac1ecb1ac..6419e71d40 100644 --- a/src/XmlLDrivers/XmlLDrivers.cxx +++ b/src/XmlLDrivers/XmlLDrivers.cxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -96,6 +96,17 @@ TCollection_AsciiString XmlLDrivers::CreationDate () return nowstr; } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void XmlLDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("XmlLOcaf", "Xml Lite OCAF Document", "xmll", + new XmlLDrivers_DocumentRetrievalDriver, + new XmlLDrivers_DocumentStorageDriver ("Copyright: Open Cascade, 2001-2002")); +} + //======================================================================= //function : AttributeDrivers //purpose : diff --git a/src/XmlLDrivers/XmlLDrivers.hxx b/src/XmlLDrivers/XmlLDrivers.hxx index fdf99677fe..85775593ea 100644 --- a/src/XmlLDrivers/XmlLDrivers.hxx +++ b/src/XmlLDrivers/XmlLDrivers.hxx @@ -16,8 +16,6 @@ #ifndef _XmlLDrivers_HeaderFile #define _XmlLDrivers_HeaderFile -#include -#include #include class Standard_Transient; @@ -28,48 +26,23 @@ class CDM_MessageDriver; class XmlLDrivers_DocumentStorageDriver; class XmlLDrivers_DocumentRetrievalDriver; class XmlLDrivers_NamespaceDef; - - +class TDocStd_Application; class XmlLDrivers { public: - - DEFINE_STANDARD_ALLOC - Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& theGUID); Standard_EXPORT static TCollection_AsciiString CreationDate(); + //! Defines format "XmlLOcaf" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); + Standard_EXPORT static Handle(XmlMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver); Standard_EXPORT static TCollection_AsciiString StorageVersion(); - - - - -protected: - - - - - -private: - - - - -friend class XmlLDrivers_DocumentStorageDriver; -friend class XmlLDrivers_DocumentRetrievalDriver; -friend class XmlLDrivers_NamespaceDef; - }; - - - - - - #endif // _XmlLDrivers_HeaderFile diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx index e4cb4c7a25..522fe5744a 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx @@ -73,16 +73,6 @@ XmlLDrivers_DocumentStorageDriver::XmlLDrivers_DocumentStorageDriver { } -//======================================================================= -//function : SchemaName -//purpose : -//======================================================================= -TCollection_ExtendedString XmlLDrivers_DocumentStorageDriver::SchemaName() const -{ - TCollection_ExtendedString schemaname; - return schemaname; -} - //======================================================================= //function : AddNamespace //purpose : diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx index 621c53fb22..4b35293676 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx @@ -45,8 +45,6 @@ public: Standard_EXPORT XmlLDrivers_DocumentStorageDriver(const TCollection_ExtendedString& theCopyright); - Standard_EXPORT virtual TCollection_ExtendedString SchemaName() const Standard_OVERRIDE; - Standard_EXPORT virtual void Write (const Handle(CDM_Document)& theDocument, const TCollection_ExtendedString& theFileName) Standard_OVERRIDE; Standard_EXPORT virtual void Write (const Handle(CDM_Document)& theDocument, Standard_OStream& theOStream) Standard_OVERRIDE; diff --git a/src/XmlTObjDrivers/XmlTObjDrivers.cxx b/src/XmlTObjDrivers/XmlTObjDrivers.cxx index e3a42b3ffb..a546d8b6b7 100644 --- a/src/XmlTObjDrivers/XmlTObjDrivers.cxx +++ b/src/XmlTObjDrivers/XmlTObjDrivers.cxx @@ -27,6 +27,7 @@ #include #include +#include static Standard_GUID XmlStorageDriver ("f78ff4a0-a779-11d5-aab4-0050044b1af1"); static Standard_GUID XmlRetrievalDriver("f78ff4a1-a779-11d5-aab4-0050044b1af1"); @@ -57,6 +58,17 @@ const Handle(Standard_Transient)& XmlTObjDrivers::Factory(const Standard_GUID& a return XmlLDrivers::Factory (aGUID); } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void XmlTObjDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("TObjXml", "Xml TObj OCAF Document", "xml", + new XmlTObjDrivers_DocumentRetrievalDriver, + new XmlTObjDrivers_DocumentStorageDriver ("Copyright: Open Cascade, 2004")); +} + //======================================================================= //function : AddDrivers //purpose : diff --git a/src/XmlTObjDrivers/XmlTObjDrivers.hxx b/src/XmlTObjDrivers/XmlTObjDrivers.hxx index dd2929d83f..1189a72db3 100644 --- a/src/XmlTObjDrivers/XmlTObjDrivers.hxx +++ b/src/XmlTObjDrivers/XmlTObjDrivers.hxx @@ -21,18 +21,23 @@ #include #include +class XmlMDF_ADriverTable; +class CDM_MessageDriver; +class TDocStd_Application; -// Class for registering storage/retrieval drivers for TObj XML persistence -// +//! Class for registering storage/retrieval drivers for TObj XML persistence class XmlTObjDrivers { public: - // ---------- PUBLIC METHODS ---------- - + + //! Returns a driver corresponding to . Used for plugin. Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& aGUID); - // Returns a driver corresponding to . Used for plugin. + + //! Defines format "TObjXml" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); Standard_EXPORT static void AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx b/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx index 7cc199c806..2ea9122536 100644 --- a/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx +++ b/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -51,4 +51,15 @@ const Handle(Standard_Transient)& XmlXCAFDrivers::Factory(const Standard_GUID& a return XmlDrivers::Factory (aGUID); } +//======================================================================= +//function : DefineFormat +//purpose : +//======================================================================= +void XmlXCAFDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp) +{ + theApp->DefineFormat ("XmlXCAF", "Xml XCAF Document", "xml", + new XmlXCAFDrivers_DocumentRetrievalDriver, + new XmlXCAFDrivers_DocumentStorageDriver ("Copyright: Open Cascade, 2001-2002")); +} + PLUGIN(XmlXCAFDrivers) diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers.hxx b/src/XmlXCAFDrivers/XmlXCAFDrivers.hxx index a259c32126..75c1110c41 100644 --- a/src/XmlXCAFDrivers/XmlXCAFDrivers.hxx +++ b/src/XmlXCAFDrivers/XmlXCAFDrivers.hxx @@ -16,23 +16,17 @@ #ifndef _XmlXCAFDrivers_HeaderFile #define _XmlXCAFDrivers_HeaderFile -#include -#include #include class Standard_Transient; class Standard_GUID; class XmlXCAFDrivers_DocumentRetrievalDriver; class XmlXCAFDrivers_DocumentStorageDriver; - - +class TDocStd_Application; class XmlXCAFDrivers { public: - - DEFINE_STANDARD_ALLOC - //! Depending from the ID, returns a list of storage //! or retrieval attribute drivers. Used for plugin. @@ -49,29 +43,9 @@ public: //! ed8793fa-3142-11d4-b9b5-0060b0ee281b XCAFSchema Standard_EXPORT static const Handle(Standard_Transient)& Factory (const Standard_GUID& aGUID); - - - -protected: - - - - - -private: - - - - -friend class XmlXCAFDrivers_DocumentRetrievalDriver; -friend class XmlXCAFDrivers_DocumentStorageDriver; - + //! Defines format "XmlXCAF" and registers its read and write drivers + //! in the specified application + Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp); }; - - - - - - #endif // _XmlXCAFDrivers_HeaderFile diff --git a/tests/bugs/caf/bug27454 b/tests/bugs/caf/bug27454 index e146f3b6bb..f537f90865 100644 --- a/tests/bugs/caf/bug27454 +++ b/tests/bugs/caf/bug27454 @@ -10,7 +10,8 @@ puts "" cpulimit 10 -catch {Open [locate_data_file bug27454_test.xml] D -stream} msg +set file [locate_data_file bug27454_test.xml] +catch {Open $file D -stream} msg cpulimit diff --git a/tests/bugs/xde/bug23010 b/tests/bugs/xde/bug23010 index d40aabd543..8e88b97682 100644 --- a/tests/bugs/xde/bug23010 +++ b/tests/bugs/xde/bug23010 @@ -6,5 +6,8 @@ puts "" # Error with a .stp model during transfer from STEPCAFControl_Reader to document ################################################################################## -pload QAcommands -OCC23010 [locate_data_file occ23010.step] +pload XSDRAW +ReadStep D [locate_data_file occ23010.step] + +data c +tpstat c