diff --git a/Makefile b/Makefile index 72ffb8b346e8e9fd0f307539d4bed6182884d672..15e224d64cccdc0652e88ab0327dd1177266b8a6 100644 --- a/Makefile +++ b/Makefile @@ -262,7 +262,7 @@ source-tree: purge source: source-tree cd gmsh-${GMSH_VERSION} && rm -rf ${GMSH_VERSION_FILE}\ - Common/GmshConfig.h contrib/Tetgen/*.{cxx,h}\ + Common/GmshConfig.h contrib/Tetgen*/*.{cxx,h}\ utils/nightly utils/misc/variables.i* tar zcf gmsh-${GMSH_VERSION}-source.tgz gmsh-${GMSH_VERSION} diff --git a/utils/api_demos/mainOcc.cpp b/utils/api_demos/mainOcc.cpp index 8a6780355afbd61d8d27c7a1bc27d9db23b70e57..733fc8f7e9437bbb38140f7e9d7eb7b8c77af5b4 100644 --- a/utils/api_demos/mainOcc.cpp +++ b/utils/api_demos/mainOcc.cpp @@ -1,4 +1,16 @@ -// g++ -I/usr/local/opencascade/inc driverOCC.cpp -lGmsh -L/usr/local/opencascade/lib -lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKIGES -lTKXSBase -lTKOffset -lTKFeat -lTKFillet -lTKBool -lTKShHealing -lTKMesh -lTKHLR -lTKBO -lTKPrim -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d -lTKG2d -lTKAdvTools -lTKMath -lTKernel -lm +// This demonstrates how to import an OpenCascade model WITHOUT using +// Gmsh's own I/O layer (useful if you create OCC objects in your own +// code, that you want to import dynamically in Gmsh). +// +// If you just want to load OpenCascade files (.brep, .step, etc.) you +// SHOULD NOT use this interface: simply use the standard I/O API. + +// g++ -I/usr/local/opencascade/inc driverOCC.cpp -lGmsh +// -L/usr/local/opencascade/lib -lTKSTEP -lTKSTEP209 -lTKSTEPAttr +// -lTKSTEPBase -lTKIGES -lTKXSBase -lTKOffset -lTKFeat -lTKFillet +// -lTKBool -lTKShHealing -lTKMesh -lTKHLR -lTKBO -lTKPrim -lTKTopAlgo +// -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d -lTKG2d -lTKAdvTools +// -lTKMath -lTKernel -lm #include <stdio.h> #include <gmsh/Gmsh.h> @@ -53,7 +65,7 @@ int main(int argc, char **argv) GmshSetMessageHandler(&c); // import the shape, and mesh it - m.importOCCShape((void*)&shape, 0); + m.importOCCShape((void*)&shape); try{ m.mesh(2); }