OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-08 18:40:55 +03:00
Code Packages Releases Activity

0033531: Configuration - Rework DataExchange ToolKits organization

Browse Source 
Integrated DE plugin functionality.
Reworked DE components:
 - TKDESTEP: Handling STEP file format.
 - TKDEOBJ: Handling OBJ file format.
 - TKDEIGES: Handling IGES file format.
 - TKDEGLTF: Handling GLTF file format.
 - TKDEVRML: Handling VRML file format.
 - TKDEPLY: Handling PLY file format.
 - TKDESTL: Handling STL file format.
Reworked DE DRAW components:
  TKXSDRAWSTEP: Container for DE command to work with STEP.
  TKXSDRAWOBJ: Container for DE command to work with OBJ.
  TKXSDRAWIGES: Container for DE command to work with IGES.
  TKXSDRAWGLTF: Container for DE command to work with GLTF.
  TKXSDRAWVRML: Container for DE command to work with VRML.
  TKXSDRAWPLY: Container for DE command to work with PLY.
  TKXSDRAWSTL: Container for DE command to work with STL.
TKXSDRAW rework to be base DRAW plugin to keep DE session and utils.
Updated documentation
Updated samples
This commit is contained in:
dpasukhi 2023-11-19 11:09:33 +00:00
parent 3aeea1e96e
commit bd651bbbd9
223 changed files with 6237 additions and 5245 deletions
adm
MODULESUDLIST
dox
contribution/tests
tests.md
user_guides/step
step.md
samples
CSharp
OCCTProxy
OCCTProxy.cpp
OCCTProxy_D3D
OCCTProxyD3D.cpp
glfw/adm/cmake
FindOpenCASCADE.cmake
ios/UIKitSample/UIKitSample.xcodeproj
project.pbxproj
java/jniviewer/app/src/main
java/com/opencascade/jnisample
OcctJniActivity.java
jni
CMakeLists.txt
mfc/standard
01_Geometry/adm/win/vc10
Geometry.vcxproj
02_Modeling
CMakeLists.txt
adm/win/vc10
Modeling.vcxproj
03_ImportExport/adm/win/vc10
ImportExport.vcxproj
mfcsample
CMakeLists.txt
adm/win/vc10
mfcsample.vcxproj
qt
IESample
EXTERNLIBIESample.pro
OCCTOverview
EXTERNLIBOCCTOverview.pro
Tutorial
EXTERNLIBTutorial.pro
webgl
CMakeLists.txt
xaml
CMakeLists.txt
src
DE
DE_PluginHolder.hxxDE_Wrapper.cxxDE_Wrapper.hxxFILES
DEBRepCascade
DEBRepCascade_ConfigurationNode.cxx
DEXCAFCascade
DEXCAFCascade_ConfigurationNode.cxx
DRAWEXE
DRAWEXE.cxxEXTERNLIB_STATIC
DrawResources
DrawPlugin
IGESCAFControl
IGESCAFControl_ConfigurationNode.cxx
OS
DataExchange.tcl
RWGltf
RWGltf_ConfigurationNode.cxx
RWObj
RWObj_ConfigurationNode.cxx
RWPly
RWPly_ConfigurationNode.cxx
RWStl
RWStl_ConfigurationNode.cxx
STEPCAFControl
STEPCAFControl_ConfigurationNode.cxx
TKDE
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDECascade
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDEGLTF
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDEIGES
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDEOBJ
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDEPLY
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDESTEP
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDESTL
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKDEVRML
CMakeLists.txtEXTERNLIBFILESPACKAGES
TKQADraw
EXTERNLIB
TKRWMesh
EXTERNLIBPACKAGES
TKSTEP
EXTERNLIBPACKAGES
TKSTEP209
EXTERNLIBPACKAGES
TKSTEPAttr
EXTERNLIBPACKAGES
TKSTEPBase
CMakeLists.txtEXTERNLIBPACKAGES
TKXDECascade
CMakeLists.txt
TKXDEDRAW
EXTERNLIB
TKXDEIGES
CMakeLists.txtEXTERNLIBPACKAGES
TKXDESTEP
CMakeLists.txtEXTERNLIBPACKAGES
TKXSBase
PACKAGES
TKXSDRAW
EXTERNLIBPACKAGES
TKXSDRAWDE
CMakeLists.txt
Show More

4
adm/MODULES

@ -3,6 +3,6 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade DataExchange TKDE TKXSBase TKDESTEP TKDEIGES TKDESTL TKDEVRML TKDECascade TKDEOBJ TKDEGLTF TKDEPLY TKXCAF TKXmlXCAF TKBinXCAF TKRWMesh
Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
DETools TKExpress ExpToCasExe DETools TKExpress ExpToCasExe
Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE TKXSDRAWDE TKXSDRAWGLTF TKXSDRAWIGES TKXSDRAWOBJ TKXSDRAWPLY TKXSDRAWSTEP TKXSDRAWSTL TKXSDRAWVRML

35
adm/UDLIST

@ -376,18 +376,13 @@ r SHMessage
r XSMessage r XSMessage
r XSTEPResource r XSTEPResource
t TKBinXCAF t TKBinXCAF
t TKIGES t TKDESTL
t TKSTEP t TKDEVRML
t TKSTEP209
t TKSTEPAttr
t TKSTEPBase
t TKSTL
t TKVRML
t TKXCAF t TKXCAF
t TKXDE t TKDE
t TKXDECascade t TKDECascade
t TKXDEIGES t TKDEIGES
t TKXDESTEP t TKDESTEP
t TKXSBase t TKXSBase
t TKXmlXCAF t TKXmlXCAF
n BOPTest n BOPTest
@ -419,7 +414,12 @@ n XDEDRAW
n XSDRAW n XSDRAW
n XSDRAWIGES n XSDRAWIGES
n XSDRAWSTEP n XSDRAWSTEP
n XSDRAWSTLVRML n XSDRAWSTL
n XSDRAWVRML
n XSDRAWDE
n XSDRAWGLTF
n XSDRAWOBJ
n XSDRAWPLY
r DrawResources r DrawResources
t TKDCAF t TKDCAF
t TKDraw t TKDraw
@ -431,6 +431,14 @@ t TKD3DHostTest
t TKViewerTest t TKViewerTest
t TKXDEDRAW t TKXDEDRAW
t TKXSDRAW t TKXSDRAW
t TKXSDRAWIGES
t TKXSDRAWSTEP
t TKXSDRAWSTL
t TKXSDRAWVRML
t TKXSDRAWDE
t TKXSDRAWGLTF
t TKXSDRAWOBJ
t TKXSDRAWPLY
x DRAWEXE x DRAWEXE
n QADraw n QADraw
n QANCollection n QANCollection
@ -456,6 +464,9 @@ t TKVCAF
n XCAFView n XCAFView
n XCAFNoteObjects n XCAFNoteObjects
t TKRWMesh t TKRWMesh
t TKDEGLTF
t TKDEOBJ
t TKDEPLY
n RWGltf n RWGltf
n RWMesh n RWMesh
n RWObj n RWObj

8
dox/contribution/tests/tests.md

@ -1089,10 +1089,10 @@ This group allows testing extended data exchange packages.
| Draw | TKDraw, TKTopTest, TKViewerTest, TKXSDRAW, TKDCAF, TKXDEDRAW, TKTObjDRAW, TKQADraw, DRAWEXE, Problems of testing system | draw | | Draw | TKDraw, TKTopTest, TKViewerTest, TKXSDRAW, TKDCAF, TKXDEDRAW, TKTObjDRAW, TKQADraw, DRAWEXE, Problems of testing system | draw |
| Shape Healing | TKShHealing | heal | | Shape Healing | TKShHealing | heal |
| Mesh | TKMesh, TKXMesh | mesh | | Mesh | TKMesh, TKXMesh | mesh |
| Data Exchange | TKIGES | iges | | Data Exchange | TKDEIGES | iges |
| Data Exchange | TKSTEPBase, TKSTEPAttr, TKSTEP209, TKSTEP | step | | Data Exchange | TKDESTEP | step |
| Data Exchange | TKSTL, TKVRML | stlvrml | | Data Exchange | TKDESTL, TKDEVRML | stlvrml |
| Data Exchange | TKXSBase, TKXCAF, TKXCAFSchema, TKXDEIGES, TKXDESTEP, TKXmlXCAF, TKBinXCAF | xde | | Data Exchange | TKXSBase, TKXCAF, TKXCAFSchema, TKXmlXCAF, TKBinXCAF | xde |
| Foundation Classes | TKernel, TKMath | fclasses | | Foundation Classes | TKernel, TKMath | fclasses |
| Modeling_algorithms | TKGeomAlgo, TKTopAlgo, TKPrim, TKBO, TKBool, TKHLR, TKFillet, TKOffset, TKFeat, TKXMesh | modalg | | Modeling_algorithms | TKGeomAlgo, TKTopAlgo, TKPrim, TKBO, TKBool, TKHLR, TKFillet, TKOffset, TKFeat, TKXMesh | modalg |
| Modeling Data | TKG2d, TKG3d, TKGeomBase, TKBRep | moddata | | Modeling Data | TKG2d, TKG3d, TKGeomBase, TKBRep | moddata |

2
dox/user_guides/step/step.md

@ -1498,7 +1498,7 @@ It is necessary to call command *newmodel* to perform a new translation of the n
@section occt_step_7 Reading from and writing to STEP @section occt_step_7 Reading from and writing to STEP
The *STEPCAFControl* package (TKXDESTEP toolkit) provides tools to read and write STEP files (see XDE User's Guide). The *STEPCAFControl* package (TKDESTEP toolkit) provides tools to read and write STEP files (see XDE User's Guide).
In addition to the translation of shapes implemented in basic translator, it provides the following: In addition to the translation of shapes implemented in basic translator, it provides the following:
* STEP assemblies, read as OCCT compounds by basic translator, are translated to XDE assemblies; * STEP assemblies, read as OCCT compounds by basic translator, are translated to XDE assemblies;

8
samples/CSharp/OCCTProxy/OCCTProxy.cpp

@ -43,10 +43,10 @@
#pragma comment(lib, "TKService.lib") #pragma comment(lib, "TKService.lib")
#pragma comment(lib, "TKV3d.lib") #pragma comment(lib, "TKV3d.lib")
#pragma comment(lib, "TKOpenGl.lib") #pragma comment(lib, "TKOpenGl.lib")
#pragma comment(lib, "TKIGES.lib") #pragma comment(lib, "TKDEIGES.lib")
#pragma comment(lib, "TKSTEP.lib") #pragma comment(lib, "TKDESTEP.lib")
#pragma comment(lib, "TKStl.lib") #pragma comment(lib, "TKDESTL.lib")
#pragma comment(lib, "TKVrml.lib") #pragma comment(lib, "TKDEVRML.lib")
#pragma comment(lib, "TKLCAF.lib") #pragma comment(lib, "TKLCAF.lib")
//! Auxiliary tool for converting C# string into UTF-8 string. //! Auxiliary tool for converting C# string into UTF-8 string.

8
samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp

@ -51,10 +51,10 @@
#pragma comment(lib, "TKV3d.lib") #pragma comment(lib, "TKV3d.lib")
#pragma comment(lib, "TKOpenGl.lib") #pragma comment(lib, "TKOpenGl.lib")
#pragma comment(lib, "TKD3dHost.lib") #pragma comment(lib, "TKD3dHost.lib")
#pragma comment(lib, "TKIGES.lib") #pragma comment(lib, "TKDEIGES.lib")
#pragma comment(lib, "TKSTEP.lib") #pragma comment(lib, "TKDESTEP.lib")
#pragma comment(lib, "TKStl.lib") #pragma comment(lib, "TKDESTL.lib")
#pragma comment(lib, "TKVrml.lib") #pragma comment(lib, "TKDEVRML.lib")
#pragma comment(lib, "TKLCAF.lib") #pragma comment(lib, "TKLCAF.lib")
#pragma comment(lib, "D3D9.lib") #pragma comment(lib, "D3D9.lib")

2
samples/glfw/adm/cmake/FindOpenCASCADE.cmake

@ -63,7 +63,7 @@ set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKG2d TKG3d TKGeomBase TKBRep) # M
set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing) # ModelingAlgorithms set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing) # ModelingAlgorithms
set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost) # Visualization set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost) # Visualization
set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF) # ApplicationFramework set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF) # ApplicationFramework
set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh) # DataExchange set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKXSBase TKXCAF TKDEIGES TKDESTEP TKDESTL TKDEVRML TKXmlXCAF TKBinXCAF TKRWMesh TKDEGLTF TKDEOBJ TKDEPLY) # DataExchange
set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKDraw TKViewerTest) # Draw set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKDraw TKViewerTest) # Draw
# validate location of OCCT libraries and headers # validate location of OCCT libraries and headers

37
samples/ios/UIKitSample/UIKitSample.xcodeproj/project.pbxproj

@ -26,14 +26,10 @@
0A7DEDFC1E2D29FF00267B9B /* libTKV3d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEDF71E2D29F800267B9B /* libTKV3d.a */; }; 0A7DEDFC1E2D29FF00267B9B /* libTKV3d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEDF71E2D29F800267B9B /* libTKV3d.a */; };
0A7DEDFD1E2D29FF00267B9B /* libTKVCAF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEDF81E2D29FB00267B9B /* libTKVCAF.a */; }; 0A7DEDFD1E2D29FF00267B9B /* libTKVCAF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEDF81E2D29FB00267B9B /* libTKVCAF.a */; };
0A7DEE2B1E2D2AE000267B9B /* libTKService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */; }; 0A7DEE2B1E2D2AE000267B9B /* libTKService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */; };
0A7DEE2E1E2D2AE000267B9B /* libTKSTEP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0E1E2D2AA800267B9B /* libTKSTEP.a */; }; 0A7DEE2E1E2D2AE000267B9B /* libTKDESTEP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0E1E2D2AA800267B9B /* libTKDESTEP.a */; };
0A7DEE301E2D2AE000267B9B /* libTKSTEPAttr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE101E2D2AAE00267B9B /* libTKSTEPAttr.a */; };
0A7DEE311E2D2AE000267B9B /* libTKSTEPBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE111E2D2AB200267B9B /* libTKSTEPBase.a */; };
0A7DEE351E2D2AE000267B9B /* libTKXCAF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */; }; 0A7DEE351E2D2AE000267B9B /* libTKXCAF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */; };
0A7DEE371E2D2AE000267B9B /* libTKXDESTEP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE171E2D2AC700267B9B /* libTKXDESTEP.a */; };
0A7DEE3E1E2D2B8100267B9B /* libTKBO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE021E2D2A7F00267B9B /* libTKBO.a */; }; 0A7DEE3E1E2D2B8100267B9B /* libTKBO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE021E2D2A7F00267B9B /* libTKBO.a */; };
0A7DEE3F1E2D2BB000267B9B /* libTKOpenGles.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */; }; 0A7DEE3F1E2D2BB000267B9B /* libTKOpenGles.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */; };
0A7DEE401E2D2BEA00267B9B /* libTKSTEP209.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0F1E2D2AAB00267B9B /* libTKSTEP209.a */; };
0A7DEE411E2D2C1500267B9B /* libTKXSBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE1D1E2D2ADC00267B9B /* libTKXSBase.a */; }; 0A7DEE411E2D2C1500267B9B /* libTKXSBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE1D1E2D2ADC00267B9B /* libTKXSBase.a */; };
0AAE0DE61EAF816E00C1F65B /* screw.step in Resources */ = {isa = PBXBuildFile; fileRef = 0AAE0DE51EAF816D00C1F65B /* screw.step */; }; 0AAE0DE61EAF816E00C1F65B /* screw.step in Resources */ = {isa = PBXBuildFile; fileRef = 0AAE0DE51EAF816D00C1F65B /* screw.step */; };
0AE286641EB0D29B00A9D719 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AE286631EB0D29A00A9D719 /* libz.tbd */; }; 0AE286641EB0D29B00A9D719 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AE286631EB0D29A00A9D719 /* libz.tbd */; };
@ -79,7 +75,7 @@
0A7DEE031E2D2A8200267B9B /* libTKBool.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKBool.a; path = ../occt/lib/libTKBool.a; sourceTree = "<group>"; }; 0A7DEE031E2D2A8200267B9B /* libTKBool.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKBool.a; path = ../occt/lib/libTKBool.a; sourceTree = "<group>"; };
0A7DEE041E2D2A8500267B9B /* libTKFeat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKFeat.a; path = ../occt/lib/libTKFeat.a; sourceTree = "<group>"; }; 0A7DEE041E2D2A8500267B9B /* libTKFeat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKFeat.a; path = ../occt/lib/libTKFeat.a; sourceTree = "<group>"; };
0A7DEE051E2D2A8900267B9B /* libTKFillet.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKFillet.a; path = ../occt/lib/libTKFillet.a; sourceTree = "<group>"; }; 0A7DEE051E2D2A8900267B9B /* libTKFillet.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKFillet.a; path = ../occt/lib/libTKFillet.a; sourceTree = "<group>"; };
0A7DEE061E2D2A8C00267B9B /* libTKIGES.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKIGES.a; path = ../occt/lib/libTKIGES.a; sourceTree = "<group>"; }; 0A7DEE061E2D2A8C00267B9B /* libTKDEIGES.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDEIGES.a; path = ../occt/lib/libTKDEIGES.a; sourceTree = "<group>"; };
0A7DEE071E2D2A8F00267B9B /* libTKMeshVS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKMeshVS.a; path = ../occt/lib/libTKMeshVS.a; sourceTree = "<group>"; }; 0A7DEE071E2D2A8F00267B9B /* libTKMeshVS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKMeshVS.a; path = ../occt/lib/libTKMeshVS.a; sourceTree = "<group>"; };
0A7DEE081E2D2A9300267B9B /* libTKOffset.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKOffset.a; path = ../occt/lib/libTKOffset.a; sourceTree = "<group>"; }; 0A7DEE081E2D2A9300267B9B /* libTKOffset.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKOffset.a; path = ../occt/lib/libTKOffset.a; sourceTree = "<group>"; };
0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKOpenGles.a; path = ../occt/lib/libTKOpenGles.a; sourceTree = "<group>"; }; 0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKOpenGles.a; path = ../occt/lib/libTKOpenGles.a; sourceTree = "<group>"; };
@ -87,16 +83,11 @@
0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKService.a; path = ../occt/lib/libTKService.a; sourceTree = "<group>"; }; 0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKService.a; path = ../occt/lib/libTKService.a; sourceTree = "<group>"; };
0A7DEE0C1E2D2AA100267B9B /* libTKStd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKStd.a; path = ../occt/lib/libTKStd.a; sourceTree = "<group>"; }; 0A7DEE0C1E2D2AA100267B9B /* libTKStd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKStd.a; path = ../occt/lib/libTKStd.a; sourceTree = "<group>"; };
0A7DEE0D1E2D2AA400267B9B /* libTKStdL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKStdL.a; path = ../occt/lib/libTKStdL.a; sourceTree = "<group>"; }; 0A7DEE0D1E2D2AA400267B9B /* libTKStdL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKStdL.a; path = ../occt/lib/libTKStdL.a; sourceTree = "<group>"; };
0A7DEE0E1E2D2AA800267B9B /* libTKSTEP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEP.a; path = ../occt/lib/libTKSTEP.a; sourceTree = "<group>"; }; 0A7DEE0E1E2D2AA800267B9B /* libTKDESTEP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDESTEP.a; path = ../occt/lib/libTKDESTEP.a; sourceTree = "<group>"; };
0A7DEE0F1E2D2AAB00267B9B /* libTKSTEP209.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEP209.a; path = ../occt/lib/libTKSTEP209.a; sourceTree = "<group>"; }; 0A7DEE121E2D2AB500267B9B /* libTKDESTL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDESTL.a; path = ../occt/lib/libTKDESTL.a; sourceTree = "<group>"; };
0A7DEE101E2D2AAE00267B9B /* libTKSTEPAttr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEPAttr.a; path = ../occt/lib/libTKSTEPAttr.a; sourceTree = "<group>"; };
0A7DEE111E2D2AB200267B9B /* libTKSTEPBase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEPBase.a; path = ../occt/lib/libTKSTEPBase.a; sourceTree = "<group>"; };
0A7DEE121E2D2AB500267B9B /* libTKSTL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTL.a; path = ../occt/lib/libTKSTL.a; sourceTree = "<group>"; };
0A7DEE131E2D2AB900267B9B /* libTKTObj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKTObj.a; path = ../occt/lib/libTKTObj.a; sourceTree = "<group>"; }; 0A7DEE131E2D2AB900267B9B /* libTKTObj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKTObj.a; path = ../occt/lib/libTKTObj.a; sourceTree = "<group>"; };
0A7DEE141E2D2ABC00267B9B /* libTKVRML.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKVRML.a; path = ../occt/lib/libTKVRML.a; sourceTree = "<group>"; }; 0A7DEE141E2D2ABC00267B9B /* libTKDEVRML.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDEVRML.a; path = ../occt/lib/libTKDEVRML.a; sourceTree = "<group>"; };
0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXCAF.a; path = ../occt/lib/libTKXCAF.a; sourceTree = "<group>"; }; 0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXCAF.a; path = ../occt/lib/libTKXCAF.a; sourceTree = "<group>"; };
0A7DEE161E2D2AC300267B9B /* libTKXDEIGES.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXDEIGES.a; path = ../occt/lib/libTKXDEIGES.a; sourceTree = "<group>"; };
0A7DEE171E2D2AC700267B9B /* libTKXDESTEP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXDESTEP.a; path = ../occt/lib/libTKXDESTEP.a; sourceTree = "<group>"; };
0A7DEE181E2D2ACA00267B9B /* libTKXMesh.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXMesh.a; path = ../occt/lib/libTKXMesh.a; sourceTree = "<group>"; }; 0A7DEE181E2D2ACA00267B9B /* libTKXMesh.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXMesh.a; path = ../occt/lib/libTKXMesh.a; sourceTree = "<group>"; };
0A7DEE191E2D2ACE00267B9B /* libTKXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXml.a; path = ../occt/lib/libTKXml.a; sourceTree = "<group>"; }; 0A7DEE191E2D2ACE00267B9B /* libTKXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXml.a; path = ../occt/lib/libTKXml.a; sourceTree = "<group>"; };
0A7DEE1A1E2D2AD100267B9B /* libTKXmlL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXmlL.a; path = ../occt/lib/libTKXmlL.a; sourceTree = "<group>"; }; 0A7DEE1A1E2D2AD100267B9B /* libTKXmlL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXmlL.a; path = ../occt/lib/libTKXmlL.a; sourceTree = "<group>"; };
@ -134,13 +125,10 @@
files = ( files = (
0AE286641EB0D29B00A9D719 /* libz.tbd in Frameworks */, 0AE286641EB0D29B00A9D719 /* libz.tbd in Frameworks */,
0A7DEE411E2D2C1500267B9B /* libTKXSBase.a in Frameworks */, 0A7DEE411E2D2C1500267B9B /* libTKXSBase.a in Frameworks */,
0A7DEE401E2D2BEA00267B9B /* libTKSTEP209.a in Frameworks */,
0A7DEE3F1E2D2BB000267B9B /* libTKOpenGles.a in Frameworks */, 0A7DEE3F1E2D2BB000267B9B /* libTKOpenGles.a in Frameworks */,
0A7DEE3E1E2D2B8100267B9B /* libTKBO.a in Frameworks */, 0A7DEE3E1E2D2B8100267B9B /* libTKBO.a in Frameworks */,
0A7DEE2B1E2D2AE000267B9B /* libTKService.a in Frameworks */, 0A7DEE2B1E2D2AE000267B9B /* libTKService.a in Frameworks */,
0A7DEE2E1E2D2AE000267B9B /* libTKSTEP.a in Frameworks */, 0A7DEE2E1E2D2AE000267B9B /* libTKDESTEP.a in Frameworks */,
0A7DEE301E2D2AE000267B9B /* libTKSTEPAttr.a in Frameworks */,
0A7DEE311E2D2AE000267B9B /* libTKSTEPBase.a in Frameworks */,
0A7DEE351E2D2AE000267B9B /* libTKXCAF.a in Frameworks */, 0A7DEE351E2D2AE000267B9B /* libTKXCAF.a in Frameworks */,
0A7DEE371E2D2AE000267B9B /* libTKXDESTEP.a in Frameworks */, 0A7DEE371E2D2AE000267B9B /* libTKXDESTEP.a in Frameworks */,
0A7DEDE71E2D28E300267B9B /* libTKBRep.a in Frameworks */, 0A7DEDE71E2D28E300267B9B /* libTKBRep.a in Frameworks */,
@ -231,7 +219,7 @@
0A7DEE031E2D2A8200267B9B /* libTKBool.a */, 0A7DEE031E2D2A8200267B9B /* libTKBool.a */,
0A7DEE041E2D2A8500267B9B /* libTKFeat.a */, 0A7DEE041E2D2A8500267B9B /* libTKFeat.a */,
0A7DEE051E2D2A8900267B9B /* libTKFillet.a */, 0A7DEE051E2D2A8900267B9B /* libTKFillet.a */,
0A7DEE061E2D2A8C00267B9B /* libTKIGES.a */, 0A7DEE061E2D2A8C00267B9B /* libTKDEIGES.a */,
0A7DEE071E2D2A8F00267B9B /* libTKMeshVS.a */, 0A7DEE071E2D2A8F00267B9B /* libTKMeshVS.a */,
0A7DEE081E2D2A9300267B9B /* libTKOffset.a */, 0A7DEE081E2D2A9300267B9B /* libTKOffset.a */,
0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */, 0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */,
@ -239,16 +227,11 @@
0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */, 0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */,
0A7DEE0C1E2D2AA100267B9B /* libTKStd.a */, 0A7DEE0C1E2D2AA100267B9B /* libTKStd.a */,
0A7DEE0D1E2D2AA400267B9B /* libTKStdL.a */, 0A7DEE0D1E2D2AA400267B9B /* libTKStdL.a */,
0A7DEE0E1E2D2AA800267B9B /* libTKSTEP.a */, 0A7DEE0E1E2D2AA800267B9B /* libTKDESTEP.a */,
0A7DEE0F1E2D2AAB00267B9B /* libTKSTEP209.a */, 0A7DEE121E2D2AB500267B9B /* libTKDESTL.a */,
0A7DEE101E2D2AAE00267B9B /* libTKSTEPAttr.a */,
0A7DEE111E2D2AB200267B9B /* libTKSTEPBase.a */,
0A7DEE121E2D2AB500267B9B /* libTKSTL.a */,
0A7DEE131E2D2AB900267B9B /* libTKTObj.a */, 0A7DEE131E2D2AB900267B9B /* libTKTObj.a */,
0A7DEE141E2D2ABC00267B9B /* libTKVRML.a */, 0A7DEE141E2D2ABC00267B9B /* libTKDEVRML.a */,
0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */, 0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */,
0A7DEE161E2D2AC300267B9B /* libTKXDEIGES.a */,
0A7DEE171E2D2AC700267B9B /* libTKXDESTEP.a */,
0A7DEE181E2D2ACA00267B9B /* libTKXMesh.a */, 0A7DEE181E2D2ACA00267B9B /* libTKXMesh.a */,
0A7DEE191E2D2ACE00267B9B /* libTKXml.a */, 0A7DEE191E2D2ACE00267B9B /* libTKXml.a */,
0A7DEE1A1E2D2AD100267B9B /* libTKXmlL.a */, 0A7DEE1A1E2D2AD100267B9B /* libTKXmlL.a */,

7
samples/java/jniviewer/app/src/main/java/com/opencascade/jnisample/OcctJniActivity.java

@ -138,11 +138,8 @@ public class OcctJniActivity extends Activity implements OnClickListener
|| !loadLibVerbose ("TKFillet", aLoaded, aFailed) || !loadLibVerbose ("TKFillet", aLoaded, aFailed)
|| !loadLibVerbose ("TKOffset", aLoaded, aFailed) || !loadLibVerbose ("TKOffset", aLoaded, aFailed)
|| !loadLibVerbose ("TKXSBase", aLoaded, aFailed) || !loadLibVerbose ("TKXSBase", aLoaded, aFailed)
|| !loadLibVerbose ("TKIGES", aLoaded, aFailed) || !loadLibVerbose ("TKDEIGES", aLoaded, aFailed)
|| !loadLibVerbose ("TKSTEPBase", aLoaded, aFailed) || !loadLibVerbose ("TKDESTEP", aLoaded, aFailed)
|| !loadLibVerbose ("TKSTEPAttr", aLoaded, aFailed)
|| !loadLibVerbose ("TKSTEP209", aLoaded, aFailed)
|| !loadLibVerbose ("TKSTEP", aLoaded, aFailed)
// OCCT Visualization // OCCT Visualization
|| !loadLibVerbose ("TKService", aLoaded, aFailed) || !loadLibVerbose ("TKService", aLoaded, aFailed)
|| !loadLibVerbose ("TKHLR", aLoaded, aFailed) || !loadLibVerbose ("TKHLR", aLoaded, aFailed)

4
samples/java/jniviewer/app/src/main/jni/CMakeLists.txt

@ -8,8 +8,8 @@ set (anOcctLibs
# exchange # exchange
TKPrim TKBO TKBool TKFillet TKOffset TKPrim TKBO TKBool TKFillet TKOffset
TKXSBase TKXSBase
TKIGES TKDEIGES
TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKDESTEP
# OCCT Visualization # OCCT Visualization
TKService TKHLR TKV3d TKOpenGles TKService TKHLR TKV3d TKOpenGles
) )

8
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj

@ -116,7 +116,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bin/Geometry.exe</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bin/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -159,7 +159,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../../win64\$(VCFMT)\bin/Geometry.exe</OutputFile> <OutputFile>../../../../win64\$(VCFMT)\bin/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -202,7 +202,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bind/Geometry.exe</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bind/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -246,7 +246,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../..\win64\$(VCFMT)\bind/Geometry.exe</OutputFile> <OutputFile>../../../..\win64\$(VCFMT)\bind/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

2
samples/mfc/standard/02_Modeling/CMakeLists.txt

@ -61,4 +61,4 @@ include_directories (${CMAKE_BINARY_DIR}/inc
${Modeling_SRC_DIR} ${Modeling_SRC_DIR}
${MFC_STANDARD_SAMPLES_DIR}/Common) ${MFC_STANDARD_SAMPLES_DIR}/Common)
target_link_libraries (Modeling mfcsample TKSTEP209 TKSTEPAttr TKSTEPBase TKBO) target_link_libraries (Modeling mfcsample TKDESTEP TKBO)

8
samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj

@ -115,7 +115,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bind/Modeling.exe</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bind/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -157,7 +157,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../../win64\$(VCFMT)\bind/Modeling.exe</OutputFile> <OutputFile>../../../../win64\$(VCFMT)\bind/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -200,7 +200,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bin/Modeling.exe</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bin/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -242,7 +242,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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)</AdditionalDependencies>
<OutputFile>../../../../win64\$(VCFMT)\bin/Modeling.exe</OutputFile> <OutputFile>../../../../win64\$(VCFMT)\bin/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

8
samples/mfc/standard/03_ImportExport/adm/win/vc10/ImportExport.vcxproj

@ -116,7 +116,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bin/ImportExport.exe</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bin/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -158,7 +158,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\$(VCFMT)\bin/ImportExport.exe</OutputFile> <OutputFile>../../../../win64\$(VCFMT)\bin/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -199,7 +199,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bind/ImportExport.exe</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bind/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -241,7 +241,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\$(VCFMT)\bind/ImportExport.exe</OutputFile> <OutputFile>../../../../win64\$(VCFMT)\bind/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

11
samples/mfc/standard/mfcsample/CMakeLists.txt

@ -158,15 +158,12 @@ include_directories( ${CMAKE_BINARY_DIR}/inc
${COMMON_RESOURCE2D_DIR}) ${COMMON_RESOURCE2D_DIR})
# OCCT libraries for using # OCCT libraries for using
set (mfcsample_USED_LIBS TKVRML set (mfcsample_USED_LIBS TKDEVRML
TKSTL TKDESTL
TKBRep TKBRep
TKIGES TKDEIGES
TKShHealing TKShHealing
TKSTEP TKDESTEP
TKSTEPBase
TKSTEP209
TKSTEPAttr
TKXSBase TKXSBase
TKBool TKBool
TKBO TKBO

8
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj

@ -115,7 +115,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bind/mfcsample.dll</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bind/mfcsample.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -158,7 +158,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\$(VCFMT)\bind/mfcsample.dll</OutputFile> <OutputFile>../../../../win64\$(VCFMT)\bind/mfcsample.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -202,7 +202,7 @@
<Culture>0x0409</Culture> <Culture>0x0409</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\$(VCFMT)\bin/mfcsample.dll</OutputFile> <OutputFile>../../../../win32\$(VCFMT)\bin/mfcsample.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -246,7 +246,7 @@
<ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName> <ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.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;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\$(VCFMT)\bin/mfcsample.dll</OutputFile> <OutputFile>../../../../win64\$(VCFMT)\bin/mfcsample.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

11
samples/qt/IESample/EXTERNLIB

@ -8,7 +8,7 @@ TKG3d
TKGeomAlgo TKGeomAlgo
TKGeomBase TKGeomBase
TKHLR TKHLR
TKIGES TKDEIGES
TKernel TKernel
TKMath TKMath
TKMesh TKMesh
@ -17,13 +17,10 @@ TKOpenGl
TKPrim TKPrim
TKShHealing TKShHealing
TKService TKService
TKSTEP TKDESTEP
TKSTEP209 TKDESTL
TKSTEPAttr
TKSTEPBase
TKSTL
TKTopAlgo TKTopAlgo
TKV3d TKV3d
TKVRML TKDEVRML
TKXSBase TKXSBase

4
samples/qt/IESample/IESample.pro

@ -72,8 +72,8 @@ win32 {
} }
LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \ LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \
-lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \ -lTKBRep -lTKDEIGES -lTKDESTL -lTKDEVRML -lTKDESTEP \
-lTKSTEPBase -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \ -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
-lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \ -lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
-lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF \ -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF \

11
samples/qt/OCCTOverview/EXTERNLIB

@ -10,7 +10,7 @@ TKGeomAlgo
TKGeomBase TKGeomBase
TKernel TKernel
TKHLR TKHLR
TKIGES TKDEIGES
TKMath TKMath
TKMesh TKMesh
TKOffset TKOffset
@ -18,14 +18,11 @@ TKOpenGl
TKPrim TKPrim
TKService TKService
TKShHealing TKShHealing
TKSTEP TKDESTEP
TKSTEP209 TKDESTL
TKSTEPAttr
TKSTEPBase
TKSTL
TKTopAlgo TKTopAlgo
TKV3d TKV3d
TKVRML TKDEVRML
TKXSBase TKXSBase
TKLCAF TKLCAF
TKCAF TKCAF

4
samples/qt/OCCTOverview/OCCTOverview.pro

@ -75,8 +75,8 @@ win32 {
} }
LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \ LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \
-lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \ -lTKBRep -lTKDEIGES -lTKDESTL -lTKDEVRML -lTKDESTEP \
-lTKSTEPBase -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \ -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
-lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \ -lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
-lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF -lTKCAF -lTKVCAF \ -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF -lTKCAF -lTKVCAF \
-lTKBin -lTKXml -lTKBin -lTKXml

11
samples/qt/Tutorial/EXTERNLIB

@ -9,7 +9,7 @@ TKGeomAlgo
TKGeomBase TKGeomBase
TKernel TKernel
TKHLR TKHLR
TKIGES TKDEIGES
TKMath TKMath
TKMesh TKMesh
TKOffset TKOffset
@ -17,13 +17,10 @@ TKOpenGl
TKPrim TKPrim
TKService TKService
TKShHealing TKShHealing
TKSTEP TKDESTEP
TKSTEP209 TKDESTL
TKSTEPAttr
TKSTEPBase
TKSTL
TKTopAlgo TKTopAlgo
TKV3d TKV3d
TKVRML TKDEVRML
TKXSBase TKXSBase

4
samples/qt/Tutorial/Tutorial.pro

@ -73,8 +73,8 @@ win32 {
} }
LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \ LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \
-lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \ -lTKBRep -lTKDEIGES -lTKDESTL -lTKDEVRML -lTKDESTEP \
-lTKSTEPBase -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \ -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
-lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \ -lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
-lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF \ -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF \

2
samples/webgl/CMakeLists.txt

@ -59,7 +59,7 @@ else()
set(OCCT_BIN_DIR) set(OCCT_BIN_DIR)
endif() endif()
set(OpenCASCADE_LIBS TKRWMesh TKBinXCAF TKBin TKBinL TKOpenGles TKXCAF TKVCAF TKCAF TKV3d TKHLR TKMesh TKService TKShHealing TKPrim TKTopAlgo TKGeomAlgo TKBRep TKGeomBase TKG3d TKG2d TKMath TKLCAF TKCDF TKernel) set(OpenCASCADE_LIBS TKRWMesh TKDEGLTF TKDEOBJ TKDEPLY TKBinXCAF TKBin TKBinL TKOpenGles TKXCAF TKVCAF TKCAF TKV3d TKHLR TKMesh TKService TKShHealing TKPrim TKTopAlgo TKGeomAlgo TKBRep TKGeomBase TKG3d TKG2d TKMath TKLCAF TKCDF TKernel)
add_executable(${APP_TARGET} ${SOURCES}) add_executable(${APP_TARGET} ${SOURCES})
target_link_libraries( target_link_libraries(

8
samples/xaml/CMakeLists.txt

@ -102,11 +102,11 @@ set (uwp_USED_LIBS TKernel
TKHLR TKHLR
TKOffset TKOffset
TKXMesh TKXMesh
TKIGES TKDEIGES
TKSTEP TKDESTEP
TKXSBase TKXSBase
TKSTL TKDESTL
TKVRML TKDEVRML
) )
target_link_libraries (uwp ${uwp_USED_LIBS}) target_link_libraries (uwp ${uwp_USED_LIBS})

45
src/DE/DE_PluginHolder.hxx Normal file

@ -0,0 +1,45 @@
// Copyright (c) 2023 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 _DE_PluginHolder_HeaderFile
#define _DE_PluginHolder_HeaderFile
#include <DE_Wrapper.hxx>
//! Base class to work with DE_Wrapper global registration of components.
//! Control life-time of current configuration node.
//! In creating stage load into global configuration.
//! On destroying stage unload from global configuration.
//! Operation to load/unload are thread safety.
template <class TheConfType>
class DE_PluginHolder
{
public:
DE_PluginHolder()
{
Standard_Mutex::Sentry aLock(DE_Wrapper::GlobalLoadMutex());
myInternalConfiguration = new TheConfType;
DE_Wrapper::GlobalWrapper()->Bind(myInternalConfiguration);
}
~DE_PluginHolder()
{
Standard_Mutex::Sentry aLock(DE_Wrapper::GlobalLoadMutex());
DE_Wrapper::GlobalWrapper()->UnBind(myInternalConfiguration);
}
private:
Handle(TheConfType) myInternalConfiguration; //!< Wrapped object
};
#endif // _DE_PluginHolder_HeaderFile

49
src/DE/DE_Wrapper.cxx

@ -35,8 +35,11 @@ namespace
return aScope; return aScope;
} }
//! Global configuration of current DE Session static Handle(DE_Wrapper)& THE_GLOBAL_CONFIGURATION()
static Handle(DE_Wrapper) THE_GLOBAL_CONFIGURATION; {
static Handle(DE_Wrapper) aConf = new DE_Wrapper();
return aConf;
}
} }
//======================================================================= //=======================================================================
@ -75,13 +78,9 @@ DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper)
// function : GlobalWrapper // function : GlobalWrapper
// purpose : // purpose :
//======================================================================= //=======================================================================
Handle(DE_Wrapper) DE_Wrapper::GlobalWrapper() const Handle(DE_Wrapper)& DE_Wrapper::GlobalWrapper()
{ {
if (THE_GLOBAL_CONFIGURATION.IsNull()) return THE_GLOBAL_CONFIGURATION();
{
THE_GLOBAL_CONFIGURATION = new DE_Wrapper();
}
return THE_GLOBAL_CONFIGURATION;
} }
//======================================================================= //=======================================================================
@ -92,10 +91,20 @@ void DE_Wrapper::SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper)
{ {
if (!theWrapper.IsNull()) if (!theWrapper.IsNull())
{ {
THE_GLOBAL_CONFIGURATION = theWrapper; THE_GLOBAL_CONFIGURATION() = theWrapper;
} }
} }
//=======================================================================
// function : GlobalLoadMutex
// purpose :
//=======================================================================
Standard_Mutex& DE_Wrapper::GlobalLoadMutex()
{
static Standard_Mutex THE_GLOBAL_LOAD_MUTEX;
return THE_GLOBAL_LOAD_MUTEX;
}
//======================================================================= //=======================================================================
// function : Read // function : Read
// purpose : // purpose :
@ -412,6 +421,28 @@ Standard_Boolean DE_Wrapper::Bind(const Handle(DE_ConfigurationNode)& theNode)
return aVendorMap->Add(aVendorName, theNode) > 0; return aVendorMap->Add(aVendorName, theNode) > 0;
} }
//=======================================================================
// function : UnBind
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::UnBind(const Handle(DE_ConfigurationNode)& theNode)
{
if (theNode.IsNull())
{
return false;
}
const TCollection_AsciiString aFileFormat = theNode->GetFormat();
const TCollection_AsciiString aVendorName = theNode->GetVendor();
DE_ConfigurationVendorMap* aVendorMap = myConfiguration.ChangeSeek(aFileFormat);
if (aVendorMap == NULL)
{
return false;
}
const auto aPrevSize = aVendorMap->Size();
aVendorMap->RemoveKey(aVendorName);
return aVendorMap->Size() != aPrevSize;
}
//======================================================================= //=======================================================================
// function : Find // function : Find
// purpose : // purpose :

14
src/DE/DE_Wrapper.hxx

@ -14,10 +14,11 @@
#ifndef _DE_Wrapper_HeaderFile #ifndef _DE_Wrapper_HeaderFile
#define _DE_Wrapper_HeaderFile #define _DE_Wrapper_HeaderFile
#include <Message_ProgressRange.hxx>
#include <DE_ConfigurationNode.hxx> #include <DE_ConfigurationNode.hxx>
#include <NCollection_IndexedDataMap.hxx> #include <Message_ProgressRange.hxx>
#include <NCollection_DataMap.hxx> #include <NCollection_DataMap.hxx>
#include <NCollection_IndexedDataMap.hxx>
#include <Standard_Mutex.hxx>
#include <TColStd_ListOfAsciiString.hxx> #include <TColStd_ListOfAsciiString.hxx>
class TopoDS_Shape; class TopoDS_Shape;
@ -64,12 +65,14 @@ public:
//! Gets global configuration singleton. //! Gets global configuration singleton.
//! If wrapper is not set, create it by default as base class object. //! If wrapper is not set, create it by default as base class object.
//! @return point to global configuration //! @return point to global configuration
Standard_EXPORT static Handle(DE_Wrapper) GlobalWrapper(); Standard_EXPORT static const Handle(DE_Wrapper)& GlobalWrapper();
//! Sets global configuration singleton //! Sets global configuration singleton
//! @param[in] theWrapper object to set as global configuration //! @param[in] theWrapper object to set as global configuration
Standard_EXPORT static void SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper); Standard_EXPORT static void SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper);
Standard_EXPORT static Standard_Mutex& GlobalLoadMutex();
public: public:
//! Reads a CAD file, according internal configuration //! Reads a CAD file, according internal configuration
@ -193,6 +196,11 @@ public:
//! @return Standard_True if binded //! @return Standard_True if binded
Standard_EXPORT Standard_Boolean Bind(const Handle(DE_ConfigurationNode)& theNode); Standard_EXPORT Standard_Boolean Bind(const Handle(DE_ConfigurationNode)& theNode);
//! Removes node with the same type from the map
//! @param[in] theNode input node to remove the same
//! @return Standard_True if removed
Standard_EXPORT Standard_Boolean UnBind(const Handle(DE_ConfigurationNode)& theNode);
//! Finds a node associated with input format and vendor //! Finds a node associated with input format and vendor
//! @param[in] theFormat input node CAD format //! @param[in] theFormat input node CAD format
//! @param[in] theVendor input node vendor name //! @param[in] theVendor input node vendor name

1
src/DE/FILES

@ -2,6 +2,7 @@ DE_ConfigurationContext.cxx
DE_ConfigurationContext.hxx DE_ConfigurationContext.hxx
DE_ConfigurationNode.cxx DE_ConfigurationNode.cxx
DE_ConfigurationNode.hxx DE_ConfigurationNode.hxx
DE_PluginHolder.hxx
DE_Provider.cxx DE_Provider.cxx
DE_Provider.hxx DE_Provider.hxx
DE_Wrapper.cxx DE_Wrapper.cxx

4
src/DEBRepCascade/DEBRepCascade_ConfigurationNode.cxx

@ -14,6 +14,7 @@
#include <DEBRepCascade_ConfigurationNode.hxx> #include <DEBRepCascade_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <DEBRepCascade_Provider.hxx> #include <DEBRepCascade_Provider.hxx>
#include <NCollection_Buffer.hxx> #include <NCollection_Buffer.hxx>
@ -26,6 +27,9 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
// Wrapper to auto-load DE component
DE_PluginHolder<DEBRepCascade_ConfigurationNode> THE_OCCT_BREP_COMPONENT_PLUGIN;
} }
//======================================================================= //=======================================================================

4
src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx

@ -14,6 +14,7 @@
#include <DEXCAFCascade_ConfigurationNode.hxx> #include <DEXCAFCascade_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <DEXCAFCascade_Provider.hxx> #include <DEXCAFCascade_Provider.hxx>
#include <NCollection_Buffer.hxx> #include <NCollection_Buffer.hxx>
@ -26,6 +27,9 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
// Wrapper to auto-load DE component
DE_PluginHolder<DEXCAFCascade_ConfigurationNode> THE_OCCT_XCAF_COMPONENT_PLUGIN;
} }
//======================================================================= //=======================================================================

55
src/DRAWEXE/DRAWEXE.cxx

@ -32,8 +32,15 @@
#endif #endif
#include <TObjDRAW.hxx> #include <TObjDRAW.hxx>
#include <ViewerTest.hxx> #include <ViewerTest.hxx>
#include <XSDRAWSTLVRML.hxx> #include <XSDRAW.hxx>
#include <XDEDRAW.hxx> #include <XDEDRAW.hxx>
#include <XSDRAWSTEP.hxx>
#include <XSDRAWIGES.hxx>
#include <XSDRAWGLTF.hxx>
#include <XSDRAWOBJ.hxx>
#include <XSDRAWPLY.hxx>
#include <XSDRAWVRML.hxx>
#include <XSDRAWSTL.hxx>
#endif #endif
Standard_IMPORT Standard_Boolean Draw_Interprete (const char* theCommand); Standard_IMPORT Standard_Boolean Draw_Interprete (const char* theCommand);
@ -200,6 +207,13 @@ static Standard_Integer Pload (Draw_Interpretor& theDI,
else if (anArg == "DATAEXCHANGE") else if (anArg == "DATAEXCHANGE")
{ {
aPlugins.Add ("XSDRAW"); aPlugins.Add ("XSDRAW");
aPlugins.Add ("XSDRAWSTEP");
aPlugins.Add ("XSDRAWIGES");
aPlugins.Add ("XSDRAWGLTF");
aPlugins.Add ("XSDRAWOBJ");
aPlugins.Add ("XSDRAWPLY");
aPlugins.Add ("XSDRAWVRML");
aPlugins.Add ("XSDRAWSTL");
aPlugins.Add ("XDEDRAW"); aPlugins.Add ("XDEDRAW");
aPlugins.Add ("AISV"); aPlugins.Add ("AISV");
} }
@ -215,6 +229,13 @@ static Standard_Integer Pload (Draw_Interpretor& theDI,
aPlugins.Add ("XSDRAW"); aPlugins.Add ("XSDRAW");
aPlugins.Add ("XDEDRAW"); aPlugins.Add ("XDEDRAW");
aPlugins.Add ("AISV"); aPlugins.Add ("AISV");
aPlugins.Add ("XSDRAWSTEP");
aPlugins.Add ("XSDRAWIGES");
aPlugins.Add ("XSDRAWGLTF");
aPlugins.Add ("XSDRAWOBJ");
aPlugins.Add ("XSDRAWPLY");
aPlugins.Add ("XSDRAWVRML");
aPlugins.Add ("XSDRAWSTL");
} }
else else
{ {
@ -254,14 +275,40 @@ static Standard_Integer Pload (Draw_Interpretor& theDI,
#endif #endif
else if (aPlugin == "XSDRAW") else if (aPlugin == "XSDRAW")
{ {
XSDRAWSTLVRML::Factory (theDI); XSDRAW::Factory (theDI);
} }
else if (aPlugin == "XDEDRAW") else if (aPlugin == "XDEDRAW")
{ {
XDEDRAW::Factory (theDI); XDEDRAW::Factory (theDI);
} }
//else if (aPlugin == "TOBJ") { TObjDRAW::Factory (theDI); } else if (aPlugin == "STEP")
//else if (aPlugin == "QACOMMANDS") { QADraw::Factory (theDI); } {
XSDRAWSTEP::Factory (theDI);
}
else if (aPlugin == "IGES")
{
XSDRAWIGES::Factory (theDI);
}
else if (aPlugin == "PLY")
{
XSDRAWPLY::Factory (theDI);
}
else if (aPlugin == "GLTF")
{
XSDRAWGLTF::Factory (theDI);
}
else if (aPlugin == "VRML")
{
XSDRAWVRML::Factory (theDI);
}
else if (aPlugin == "STL")
{
XSDRAWSTL::Factory (theDI);
}
else if (aPlugin == "OBJ")
{
XSDRAWOBJ::Factory (theDI);
}
else else
{ {
theDI << "Error: unknown plugin '" << aPlugin << "'"; theDI << "Error: unknown plugin '" << aPlugin << "'";

27
src/DRAWEXE/EXTERNLIB_STATIC

@ -2,27 +2,32 @@ TKTopTest
TKDCAF TKDCAF
TKXSDRAW TKXSDRAW
TKXDEDRAW TKXDEDRAW
TKXSDRAWSTEP
TKXSDRAWIGES
TKXSDRAWGLTF
TKXSDRAWOBJ
TKXSDRAWPLY
TKXSDRAWVRML
TKXSDRAWSTL
TKOpenGlTest TKOpenGlTest
TKOpenGlesTest TKOpenGlesTest
TKViewerTest TKViewerTest
TKDraw TKDraw
TKMeshVS TKMeshVS
TKXDECascade
TKTObj TKTObj
TKBinTObj TKBinTObj
TKXmlTObj TKXmlTObj
TKXDESTEP
TKSTEP
TKSTEPAttr
TKSTEP209
TKSTEPBase
TKXDEIGES
TKIGES
TKXSBase TKXSBase
TKVRML
TKSTL
TKRWMesh TKRWMesh
TKXDE TKDE
TKDESTEP
TKDEIGES
TKDEGLTF
TKDEOBJ
TKDEPLY
TKDEVRML
TKDESTL
TKDECascade
TKBinXCAF TKBinXCAF
TKXmlXCAF TKXmlXCAF
TKBin TKBin

12
src/DrawResources/DrawPlugin

@ -33,10 +33,10 @@ DEFAULT : MODELING
MODELING : TOPTEST MODELING : TOPTEST
VISUALIZATION : AISV VISUALIZATION : AISV
OCAFKERNEL : DCAF OCAFKERNEL : DCAF
DATAEXCHANGEKERNEL : XSDRAW DATAEXCHANGEKERNEL : XSDRAW, DE
OCAF : VISUALIZATION, OCAFKERNEL OCAF : VISUALIZATION, OCAFKERNEL
DATAEXCHANGE : XDE, VISUALIZATION DATAEXCHANGE : XDE, VISUALIZATION
XDE : DATAEXCHANGEKERNEL, XDEDRAW XDE : DATAEXCHANGEKERNEL, XDEDRAW, STEP, IGES, GLTF, OBJ, PLY, STL, VRML
ALL : MODELING, OCAFKERNEL, DATAEXCHANGE ALL : MODELING, OCAFKERNEL, DATAEXCHANGE
TOPTEST : TKTopTest TOPTEST : TKTopTest
@ -54,3 +54,11 @@ DFBROWSER : TKDFBrowser
QAcommands : TKQADraw QAcommands : TKQADraw
VIS : TKIVtkDraw VIS : TKIVtkDraw
INSPECTOR : TKToolsDraw INSPECTOR : TKToolsDraw
DE : TKXSDRAWDE
STEP : TKXSDRAWSTEP
IGES : TKXSDRAWIGES
GLTF : TKXSDRAWGLTF
OBJ : TKXSDRAWOBJ
PLY : TKXSDRAWPLY
STL : TKXSDRAWSTL
VRML : TKXSDRAWVRML

4
src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx

@ -14,6 +14,7 @@
#include <IGESCAFControl_ConfigurationNode.hxx> #include <IGESCAFControl_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <IGESCAFControl_Provider.hxx> #include <IGESCAFControl_Provider.hxx>
#include <NCollection_Buffer.hxx> #include <NCollection_Buffer.hxx>
@ -26,6 +27,9 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
// Wrapper to auto-load DE component
DE_PluginHolder<IGESCAFControl_ConfigurationNode> THE_OCCT_IGES_COMPONENT_PLUGIN;
} }
//======================================================================= //=======================================================================

8
src/OS/DataExchange.tcl

@ -15,10 +15,10 @@
;# Liste des toolkits WOK sous forme de full path ;# Liste des toolkits WOK sous forme de full path
;# ;#
proc DataExchange:toolkits { } { proc DataExchange:toolkits { } {
return [list TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES \ return [list TKXSBase TKXCAF TKDEIGES TKDESTEP \
TKXCAF TKXDEIGES TKXDESTEP \ TKDE TKDECascade TKDESTL TKDEVRML \
TKXDE TKXDECascade \ TKXmlXCAF TKBinXCAF TKRWMesh \
TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh] TKDEGLTF TKDEOBJ TKDEPLY]
} }
;# ;#

4
src/RWGltf/RWGltf_ConfigurationNode.cxx

@ -14,6 +14,7 @@
#include <RWGltf_ConfigurationNode.hxx> #include <RWGltf_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <RWGltf_Provider.hxx> #include <RWGltf_Provider.hxx>
IMPLEMENT_STANDARD_RTTIEXT(RWGltf_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(RWGltf_ConfigurationNode, DE_ConfigurationNode)
@ -25,6 +26,9 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
// Wrapper to auto-load DE component
DE_PluginHolder<RWGltf_ConfigurationNode> THE_OCCT_GLTF_COMPONENT_PLUGIN;
} }
//======================================================================= //=======================================================================

4
src/RWObj/RWObj_ConfigurationNode.cxx

@ -14,6 +14,7 @@
#include <RWObj_ConfigurationNode.hxx> #include <RWObj_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <RWObj_Provider.hxx> #include <RWObj_Provider.hxx>
IMPLEMENT_STANDARD_RTTIEXT(RWObj_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(RWObj_ConfigurationNode, DE_ConfigurationNode)
@ -25,6 +26,9 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
// Wrapper to auto-load DE component
DE_PluginHolder<RWObj_ConfigurationNode> THE_OCCT_OBJ_COMPONENT_PLUGIN;
} }
//======================================================================= //=======================================================================

17
src/RWPly/RWPly_ConfigurationNode.cxx

@ -14,12 +14,23 @@
#include <RWPly_ConfigurationNode.hxx> #include <RWPly_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <NCollection_Buffer.hxx> #include <NCollection_Buffer.hxx>
#include <RWPly_Provider.hxx> #include <RWPly_Provider.hxx>
IMPLEMENT_STANDARD_RTTIEXT(RWPly_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(RWPly_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
// Wrapper to auto-load DE component
DE_PluginHolder<RWPly_ConfigurationNode> THE_OCCT_PLY_COMPONENT_PLUGIN;
}
//======================================================================= //=======================================================================
// function : RWPly_ConfigurationNode // function : RWPly_ConfigurationNode
@ -45,7 +56,7 @@ RWPly_ConfigurationNode::RWPly_ConfigurationNode(const Handle(RWPly_Configuratio
//======================================================================= //=======================================================================
bool RWPly_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool RWPly_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.FileLengthUnit = InternalParameters.FileLengthUnit =
theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope); theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope);
InternalParameters.SystemCS = InternalParameters.SystemCS =
@ -79,7 +90,7 @@ TCollection_AsciiString RWPly_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Common parameters:\n"; aResult += "!Common parameters:\n";

4
src/RWStl/RWStl_ConfigurationNode.cxx

@ -14,6 +14,7 @@
#include <RWStl_ConfigurationNode.hxx> #include <RWStl_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <NCollection_Buffer.hxx> #include <NCollection_Buffer.hxx>
#include <RWStl_Provider.hxx> #include <RWStl_Provider.hxx>
@ -26,6 +27,9 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
// Wrapper to auto-load DE component
DE_PluginHolder<RWStl_ConfigurationNode> THE_OCCT_STL_COMPONENT_PLUGIN;
} }
//======================================================================= //=======================================================================

4
src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx

@ -14,6 +14,7 @@
#include <STEPCAFControl_ConfigurationNode.hxx> #include <STEPCAFControl_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx> #include <DE_ConfigurationContext.hxx>
#include <DE_PluginHolder.hxx>
#include <NCollection_Buffer.hxx> #include <NCollection_Buffer.hxx>
#include <STEPCAFControl_Provider.hxx> #include <STEPCAFControl_Provider.hxx>
@ -26,6 +27,9 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
// Wrapper to auto-load DE component
DE_PluginHolder<STEPCAFControl_ConfigurationNode> THE_OCCT_STEP_COMPONENT_PLUGIN;
} }
//======================================================================= //=======================================================================

2
src/TKXDE/CMakeLists.txt → src/TKDE/CMakeLists.txt

@ -1,3 +1,3 @@
project(TKXDE) project(TKDE)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

0
src/TKXDE/EXTERNLIB → src/TKDE/EXTERNLIB

0
src/TKIGES/FILES → src/TKDE/FILES Executable file → Normal file

0
src/TKXDE/PACKAGES → src/TKDE/PACKAGES

2
src/TKSTEPAttr/CMakeLists.txt → src/TKDECascade/CMakeLists.txt

@ -1,3 +1,3 @@
project(TKSTEPAttr) project(TKDECascade)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

2
src/TKXDECascade/EXTERNLIB → src/TKDECascade/EXTERNLIB

@ -8,7 +8,7 @@ TKXml
TKXmlL TKXmlL
TKXmlTObj TKXmlTObj
TKXmlXCAF TKXmlXCAF
TKXDE TKDE
TKernel TKernel
TKMath TKMath
TKLCAF TKLCAF

0
src/TKSTEP/FILES → src/TKDECascade/FILES Executable file → Normal file

0
src/TKXDECascade/PACKAGES → src/TKDECascade/PACKAGES

2
src/TKSTEP/CMakeLists.txt → src/TKDEGLTF/CMakeLists.txt

@ -1,3 +1,3 @@
project(TKSTEP) project(TKDEGLTF)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

13
src/TKDEGLTF/EXTERNLIB Normal file

@ -0,0 +1,13 @@
TKernel
TKMath
TKMesh
TKXCAF
TKLCAF
TKV3d
TKBRep
TKG3d
TKDE
TKService
TKRWMesh
CSF_RapidJSON
CSF_Draco

0
src/TKSTEP209/FILES → src/TKDEGLTF/FILES Executable file → Normal file

1
src/TKDEGLTF/PACKAGES Normal file

@ -0,0 +1 @@
RWGltf

3
src/TKDEIGES/CMakeLists.txt Normal file

@ -0,0 +1,3 @@
project(TKDEIGES)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

12
src/TKIGES/EXTERNLIB → src/TKDEIGES/EXTERNLIB Executable file → Normal file

@ -1,12 +1,16 @@
TKBRep TKBRep
TKDE
TKernel TKernel
TKMath TKMath
TKTopAlgo TKTopAlgo
TKShHealing TKShHealing
TKG2d TKXSBase
TKG3d
TKGeomBase TKGeomBase
TKGeomAlgo TKGeomAlgo
TKPrim
TKBool TKBool
TKXSBase TKPrim
TKCDF
TKLCAF
TKG2d
TKG3d
TKXCAF

0
src/TKSTEPAttr/FILES → src/TKDEIGES/FILES Executable file → Normal file

1
src/TKIGES/PACKAGES → src/TKDEIGES/PACKAGES Executable file → Normal file

@ -1,3 +1,4 @@
IGESCAFControl
IGESData IGESData
IGESFile IGESFile
IGESBasic IGESBasic

2
src/TKIGES/CMakeLists.txt → src/TKDEOBJ/CMakeLists.txt

@ -1,3 +1,3 @@
project(TKIGES) project(TKDEOBJ)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

12
src/TKDEOBJ/EXTERNLIB Normal file

@ -0,0 +1,12 @@
TKernel
TKMath
TKMesh
TKXCAF
TKLCAF
TKV3d
TKBRep
TKG3d
TKDE
TKService
TKRWMesh
CSF_RapidJSON

0
src/TKSTEPBase/FILES → src/TKDEOBJ/FILES Executable file → Normal file

1
src/TKDEOBJ/PACKAGES Normal file

@ -0,0 +1 @@
RWObj

2
src/TKVRML/CMakeLists.txt → src/TKDEPLY/CMakeLists.txt

@ -1,3 +1,3 @@
project(TKVRML) project(TKDEPLY)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

12
src/TKDEPLY/EXTERNLIB Normal file

@ -0,0 +1,12 @@
TKernel
TKMath
TKMesh
TKXCAF
TKLCAF
TKV3d
TKBRep
TKG3d
TKDE
TKService
TKRWMesh
CSF_RapidJSON

0
src/TKSTL/FILES → src/TKDEPLY/FILES Executable file → Normal file

1
src/TKDEPLY/PACKAGES Normal file

@ -0,0 +1 @@
RWPly

3
src/TKDESTEP/CMakeLists.txt Normal file

@ -0,0 +1,3 @@
project(TKDESTEP)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

23
src/TKDESTEP/EXTERNLIB Normal file

@ -0,0 +1,23 @@
TKDE
TKBRep
TKernel
TKMath
TKXSBase
TKTopAlgo
TKG2d
TKCAF
TKCDF
TKLCAF
TKG3d
TKXCAF
TKShHealing
TKernel
TKBRep
TKMath
TKG2d
TKShHealing
TKTopAlgo
TKG3d
TKGeomBase
TKGeomAlgo
TKXSBase

0
src/TKVRML/FILES → src/TKDESTEP/FILES Executable file → Normal file

40
src/TKDESTEP/PACKAGES Normal file

@ -0,0 +1,40 @@
STEPCAFControl
StepAP214
RWStepAP214
StepAP203
RWStepAP203
STEPConstruct
STEPEdit
GeomToStep
StepToGeom
StepToTopoDS
TopoDSToStep
STEPControl
STEPSelections
StepAP209
RWStepAP242
StepAP242
StepElement
StepFEA
RWStepElement
RWStepFEA
StepVisual
RWStepVisual
StepDimTol
RWStepDimTol
StepKinematics
RWStepKinematics
StepBasic
RWStepBasic
StepRepr
RWStepRepr
StepGeom
RWStepGeom
StepShape
RWStepShape
StepSelect
StepData
StepFile
RWHeaderSection
APIHeaderSection
HeaderSection

2
src/TKSTL/CMakeLists.txt → src/TKDESTL/CMakeLists.txt

@ -1,3 +1,3 @@
project(TKSTL) project(TKDESTL)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

2
src/TKSTL/EXTERNLIB → src/TKDESTL/EXTERNLIB Executable file → Normal file

@ -1,4 +1,4 @@
TKXDE TKDE
TKernel TKernel
TKMath TKMath
TKBRep TKBRep

0
src/TKXDE/FILES → src/TKDESTL/FILES

0
src/TKSTL/PACKAGES → src/TKDESTL/PACKAGES Executable file → Normal file

3
src/TKDEVRML/CMakeLists.txt Normal file

@ -0,0 +1,3 @@
project(TKDEVRML)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

2
src/TKVRML/EXTERNLIB → src/TKDEVRML/EXTERNLIB Executable file → Normal file

@ -1,5 +1,5 @@
TKBRep TKBRep
TKXDE TKDE
TKTopAlgo TKTopAlgo
TKMath TKMath
TKGeomBase TKGeomBase

0
src/TKXDECascade/FILES → src/TKDEVRML/FILES

0
src/TKVRML/PACKAGES → src/TKDEVRML/PACKAGES Executable file → Normal file

8
src/TKQADraw/EXTERNLIB

@ -23,16 +23,14 @@ TKOffset
TKFeat TKFeat
TKCAF TKCAF
TKVCAF TKVCAF
TKIGES TKDEIGES
TKXSBase TKXSBase
TKMesh TKMesh
TKXCAF TKXCAF
TKBinXCAF TKBinXCAF
TKSTEP TKDESTEP
TKSTEPBase
TKXDESTEP
TKXSDRAW TKXSDRAW
TKSTL TKDESTL
TKXml TKXml
TKTObj TKTObj
TKXmlL TKXmlL

2
src/TKRWMesh/EXTERNLIB

@ -6,7 +6,7 @@ TKLCAF
TKV3d TKV3d
TKBRep TKBRep
TKG3d TKG3d
TKXDE TKDE
TKService TKService
CSF_RapidJSON CSF_RapidJSON
CSF_Draco CSF_Draco

3
src/TKRWMesh/PACKAGES

@ -1,4 +1 @@
RWGltf
RWMesh RWMesh
RWObj
RWPly

13
src/TKSTEP/EXTERNLIB

@ -1,13 +0,0 @@
TKernel
TKSTEPAttr
TKSTEP209
TKSTEPBase
TKBRep
TKMath
TKG2d
TKShHealing
TKTopAlgo
TKG3d
TKGeomBase
TKGeomAlgo
TKXSBase

15
src/TKSTEP/PACKAGES

@ -1,15 +0,0 @@
StepAP214
RWStepAP214
StepAP203
RWStepAP203
STEPConstruct
STEPEdit
GeomToStep
StepToGeom
StepToTopoDS
TopoDSToStep
STEPControl
STEPSelections
StepAP209
RWStepAP242
StepAP242

3
src/TKSTEP209/EXTERNLIB

@ -1,3 +0,0 @@
TKernel
TKXSBase
TKSTEPBase

4
src/TKSTEP209/PACKAGES

@ -1,4 +0,0 @@
StepElement
StepFEA
RWStepElement
RWStepFEA

3
src/TKSTEPAttr/EXTERNLIB

@ -1,3 +0,0 @@
TKernel
TKXSBase
TKSTEPBase

6
src/TKSTEPAttr/PACKAGES

@ -1,6 +0,0 @@
StepVisual
RWStepVisual
StepDimTol
RWStepDimTol
StepKinematics
RWStepKinematics

3
src/TKSTEPBase/CMakeLists.txt

@ -1,3 +0,0 @@
project(TKSTEPBase)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

3
src/TKSTEPBase/EXTERNLIB

@ -1,3 +0,0 @@
TKernel
TKXSBase
TKMath

8
src/TKSTEPBase/PACKAGES

@ -1,8 +0,0 @@
StepBasic
RWStepBasic
StepRepr
RWStepRepr
StepGeom
RWStepGeom
StepShape
RWStepShape

3
src/TKXDECascade/CMakeLists.txt

@ -1,3 +0,0 @@
project(TKXDECascade)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

18
src/TKXDEDRAW/EXTERNLIB

@ -1,9 +1,8 @@
TKXDE TKDE
TKCDF TKCDF
TKBRep TKBRep
TKXCAF TKXCAF
TKernel TKernel
TKIGES
TKV3d TKV3d
TKMath TKMath
TKService TKService
@ -16,17 +15,18 @@ TKTopAlgo
TKLCAF TKLCAF
TKG3d TKG3d
TKRWMesh TKRWMesh
TKSTEPBase TKDEOBJ
TKSTEP TKDEGLTF
TKSTL TKDEPLY
TKDESTL
TKMesh TKMesh
TKXSDRAW TKXSDRAW
TKXDECascade TKDECascade
TKXDEIGES TKDEIGES
TKXDESTEP TKDESTEP
TKDCAF TKDCAF
TKViewerTest TKViewerTest
TKBinXCAF TKBinXCAF
TKXmlXCAF TKXmlXCAF
TKVRML TKDEVRML

3
src/TKXDEIGES/CMakeLists.txt

@ -1,3 +0,0 @@
project(TKXDEIGES)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

11
src/TKXDEIGES/EXTERNLIB

@ -1,11 +0,0 @@
TKBRep
TKXDE
TKernel
TKMath
TKXSBase
TKCDF
TKLCAF
TKG2d
TKG3d
TKXCAF
TKIGES

1
src/TKXDEIGES/PACKAGES

@ -1 +0,0 @@
IGESCAFControl

3
src/TKXDESTEP/CMakeLists.txt

@ -1,3 +0,0 @@
project(TKXDESTEP)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

16
src/TKXDESTEP/EXTERNLIB

@ -1,16 +0,0 @@
TKXDE
TKBRep
TKSTEPAttr
TKernel
TKMath
TKXSBase
TKTopAlgo
TKG2d
TKCAF
TKSTEPBase
TKCDF
TKLCAF
TKG3d
TKXCAF
TKSTEP
TKShHealing

1
src/TKXDESTEP/PACKAGES

@ -1 +0,0 @@
STEPCAFControl

6
src/TKXSBase/PACKAGES

@ -4,12 +4,6 @@ IFGraph
IFSelect IFSelect
TransferBRep TransferBRep
XSControl XSControl
StepData
StepFile
HeaderSection
RWHeaderSection
APIHeaderSection
StepSelect
XSAlgo XSAlgo
LibCtl LibCtl
MoniTool MoniTool

6
src/TKXSDRAW/EXTERNLIB

@ -8,17 +8,11 @@ TKMeshVS
TKG3d TKG3d
TKViewerTest TKViewerTest
TKG2d TKG2d
TKSTEPBase
TKTopAlgo TKTopAlgo
TKGeomBase TKGeomBase
TKGeomAlgo TKGeomAlgo
TKMesh TKMesh
TKDraw TKDraw
TKSTEP
TKIGES
TKSTL
TKVRML
TKLCAF TKLCAF
TKDCAF TKDCAF
TKXCAF TKXCAF
TKRWMesh

3
src/TKXSDRAW/PACKAGES

@ -1,4 +1 @@
XSDRAW XSDRAW
XSDRAWIGES
XSDRAWSTEP
XSDRAWSTLVRML

2
src/TKSTEP209/CMakeLists.txt → src/TKXSDRAWDE/CMakeLists.txt

@ -1,3 +1,3 @@
project(TKSTEP209) project(TKXSDRAWDE)
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

Some files were not shown because too many files have changed in this diff Show More