From 7df1699f2bc7d150133883da49404bf54f836a01 Mon Sep 17 00:00:00 2001 From: Gerhard Kitzler Date: Thu, 4 Sep 2014 15:59:49 +0000 Subject: [PATCH] adaptions for use with netgen/nglib 6.0 --- windows/netgen.sln | 22 +++++++++++++++++++- windows/netgen.vcxproj | 40 +++++++++++++++++++++--------------- windows/nglib.vcxproj | 28 +++++++++++++------------ windows/postBuild_netgen.bat | 2 ++ windows/postBuild_nglib.bat | 3 ++- 5 files changed, 63 insertions(+), 32 deletions(-) diff --git a/windows/netgen.sln b/windows/netgen.sln index 55de48a6..d5f0809a 100644 --- a/windows/netgen.sln +++ b/windows/netgen.sln @@ -1,8 +1,12 @@  -Microsoft Visual Studio Solution File, Format Version 13.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 +VisualStudioVersion = 12.0.30501.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netgen", "netgen.vcxproj", "{87468946-A594-4101-81A4-A131F35261EF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nglib", "nglib.vcxproj", "{2E260C8C-595C-442A-A962-51AC06EF8143}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug(OCC)|Win32 = Debug(OCC)|Win32 @@ -31,6 +35,22 @@ Global {87468946-A594-4101-81A4-A131F35261EF}.Release|Win32.Build.0 = Release|Win32 {87468946-A594-4101-81A4-A131F35261EF}.Release|x64.ActiveCfg = Release|x64 {87468946-A594-4101-81A4-A131F35261EF}.Release|x64.Build.0 = Release|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug(OCC)|Win32.ActiveCfg = Debug|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug(OCC)|Win32.Build.0 = Debug|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug(OCC)|x64.ActiveCfg = Debug|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug(OCC)|x64.Build.0 = Debug|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|Win32.ActiveCfg = Debug|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|Win32.Build.0 = Debug|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|x64.ActiveCfg = Debug|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|x64.Build.0 = Debug|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|Win32.ActiveCfg = Release(OCC)|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|Win32.Build.0 = Release(OCC)|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|x64.ActiveCfg = Release(OCC)|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|x64.Build.0 = Release(OCC)|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release|Win32.ActiveCfg = Release|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release|Win32.Build.0 = Release|Win32 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release|x64.ActiveCfg = Release|x64 + {2E260C8C-595C-442A-A962-51AC06EF8143}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/netgen.vcxproj b/windows/netgen.vcxproj index 6edb62b3..52afd285 100644 --- a/windows/netgen.vcxproj +++ b/windows/netgen.vcxproj @@ -167,7 +167,7 @@ Disabled false false - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthread-w32\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthread-w32\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -210,7 +210,7 @@ Disabled false false - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl-64\include;$(SolutionDir)..\..\ext_libs\pthread-w64\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl-64\include;$(SolutionDir)..\..\ext_libs\pthread-w64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -252,8 +252,8 @@ true Speed true - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include - WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;%(PreprocessorDefinitions) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(BOOSTROOT);$(PYTHONROOT)\include; + WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;NG_PYTHON;%(PreprocessorDefinitions) true MultiThreadedDLL StreamingSIMDExtensions @@ -270,7 +270,7 @@ pthreadVC2.lib;tcl85.lib;tk85.lib;tix84.lib;zdll.lib;Togl17.lib;glu32.lib;opengl32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) NotSet - $(SolutionDir)..\..\ext_libs\tcl\lib\x86;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\win32;%(AdditionalLibraryDirectories) + $(SolutionDir)..\..\ext_libs\tcl\lib\x86;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\win32;$(PYTHONROOT)\libs;$(BOOSTROOT)\lib;%(AdditionalLibraryDirectories) true false Console @@ -300,8 +300,8 @@ true Speed true - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(SolutionDir)..\..\ext_libs\zlib\include - WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;%(PreprocessorDefinitions) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(BOOSTROOT);$(PYTHONROOT)\include; + WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;NG_PYTHON;%(PreprocessorDefinitions) true MultiThreadedDLL StreamingSIMDExtensions2 @@ -319,7 +319,7 @@ NotSet $(OutDir)$(ProjectName).exe - $(SolutionDir)..\..\ext_libs\tcl\lib\x64;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\x64;%(AdditionalLibraryDirectories) + $(SolutionDir)..\..\ext_libs\tcl\lib\x64;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\x64;$(BOOSTROOT)\lib;$(PYTHONROOT)\libs;%(AdditionalLibraryDirectories) true false Console @@ -346,8 +346,8 @@ true Speed true - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) - WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;%(PreprocessorDefinitions) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) + WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;NG_PYTHON;%(PreprocessorDefinitions) true MultiThreadedDLL StreamingSIMDExtensions @@ -364,7 +364,7 @@ pthreadVC2.lib;tcl85.lib;tk85.lib;tix84.lib;zdll.lib;Togl17.lib;glu32.lib;opengl32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKDCAF.lib;TKLCAF.lib;%(AdditionalDependencies) NotSet - $(SolutionDir)..\..\ext_libs\tcl\lib\x86;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\win32;$(CASROOT)\win32\vc8\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)..\..\ext_libs\tcl\lib\x86;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\win32;$(CASROOT)\win32\vc8\lib;$(PYTHONROOT)\libs;$(BOOSTROOT)\lib;%(AdditionalLibraryDirectories) true false Console @@ -394,8 +394,8 @@ true Speed true - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) - WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;_OCC64;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;%(PreprocessorDefinitions) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) + WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;_OCC64;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;FFMPEG;NG_PYTHON;%(PreprocessorDefinitions) true MultiThreadedDLL StreamingSIMDExtensions @@ -412,7 +412,7 @@ pthreadVC2.lib;tcl85.lib;tk85.lib;zlib1.lib;tix84.lib;Togl17.lib;glu32.lib;opengl32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKLCAF.lib;%(AdditionalDependencies) NotSet - $(SolutionDir)..\..\ext_libs\tcl\lib\x64;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\lib;$(CASROOT)\win64\vc9\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)..\..\ext_libs\tcl\lib\x64;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\lib;$(CASROOT)\win64\vc9\lib;$(BOOSTROOT)\lib;$(PYTHONROOT)\libs;%(AdditionalLibraryDirectories) true false Console @@ -429,6 +429,10 @@ Running POSTBUILD Script.... "$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(Configuration)" "$(Platform)" "$(ProjectDir)" "nginterface" + + if NOT defined PYTHONROOT (echo You need to set up environement variable PYTHONROOT) +if NOT defined BOOSTROOT (echo You need to set up environement variable BOOSTROOT) + @@ -438,7 +442,7 @@ Disabled false false - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthread-w32\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthread-w32\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) WIN32;WNT;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -481,7 +485,7 @@ Disabled false false - $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl-64\include;$(SolutionDir)..\..\ext_libs\pthread-w64\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) + $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(BOOSTROOT);$(PYTHONROOT)\include;$(SolutionDir)..\..\ext_libs\tcl-64\include;$(SolutionDir)..\..\ext_libs\pthread-w64\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories) WIN32;WNT;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;_OCC64;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -667,7 +671,10 @@ + + + @@ -825,7 +832,6 @@ - diff --git a/windows/nglib.vcxproj b/windows/nglib.vcxproj index a09501ce..f5bc7075 100644 --- a/windows/nglib.vcxproj +++ b/windows/nglib.vcxproj @@ -201,8 +201,8 @@ AnySuitable true Speed - $(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + $(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;$(BOOSTROOT);$(PYTHONROOT)\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502;NG_PYTHON;%(PreprocessorDefinitions) MultiThreadedDLL true StreamingSIMDExtensions @@ -217,7 +217,7 @@ pthreadVC2.lib;zdll.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;C:\Python34\libs;$(BOOSTROOT)\lib;$(PYTHONROOT)\libs;%(AdditionalLibraryDirectories) $(OutDir)$(TargetFileName).intermediate.manifest @@ -242,8 +242,8 @@ AnySuitable true Speed - $(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502;NOTCL;%(PreprocessorDefinitions) + $(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;$(BOOSTROOT);$(PYTHONROOT)\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502;NOTCL;NG_PYTHON;%(PreprocessorDefinitions) MultiThreadedDLL true StreamingSIMDExtensions @@ -258,7 +258,7 @@ pthreadVC2.lib;zlib1.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\\lib;$(BOOSTROOT)\lib;$(PYTHONROOT)\libs;%(AdditionalLibraryDirectories) $(OutDir)$(TargetFileName).intermediate.manifest MachineX64 @@ -281,8 +281,8 @@ AnySuitable true Speed - $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;%(AdditionalIncludeDirectories) - WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;$(BOOSTROOT);$(PYTHONROOT)\include;%(AdditionalIncludeDirectories) + WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;_WIN32_WINNT=0x0502;NG_PYTHON;%(PreprocessorDefinitions) MultiThreadedDLL true StreamingSIMDExtensions @@ -297,7 +297,7 @@ pthreadVC2.lib;zdll.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKDCAF.lib;TKLCAF.lib;%(AdditionalDependencies) - $(CASROOT)\win32\vc8\lib;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;%(AdditionalLibraryDirectories) + $(CASROOT)\win32\vc8\lib;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(BOOSTROOT)\lib;$(PYTHONROOT)\libs;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;%(AdditionalLibraryDirectories) $(OutDir)$(TargetFileName).intermediate.manifest @@ -322,8 +322,8 @@ AnySuitable true Speed - $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;$(SolutionDir)..\..\ext_libs\zlib\include;%(AdditionalIncludeDirectories) - WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;_OCC64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;$(SolutionDir)..\..\ext_libs\zlib\include;$(BOOSTROOT);$(PYTHONROOT)\include;%(AdditionalIncludeDirectories) + WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;_OCC64;_WIN32_WINNT=0x0502;NG_PYTHON;%(PreprocessorDefinitions) MultiThreadedDLL true StreamingSIMDExtensions @@ -338,7 +338,7 @@ pthreadVC2.lib;zlib1.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKLCAF.lib;%(AdditionalDependencies) - $(CASROOT)\win64\vc9\lib;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\\lib;%(AdditionalLibraryDirectories) + $(CASROOT)\win64\vc9\lib;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\\lib;$(BOOSTROOT)\lib;$(PYTHONROOT)\libs;%(AdditionalLibraryDirectories) $(OutDir)$(TargetFileName).intermediate.manifest MachineX64 @@ -353,6 +353,8 @@ + + @@ -405,6 +407,7 @@ + @@ -485,7 +488,6 @@ - diff --git a/windows/postBuild_netgen.bat b/windows/postBuild_netgen.bat index 452349a2..be7f269c 100644 --- a/windows/postBuild_netgen.bat +++ b/windows/postBuild_netgen.bat @@ -100,6 +100,7 @@ if /i "%BUILD_ARCH%" == "x64" ( xcopy "%PROJ_DIR%..\..\ext_libs\tcl\lib\x64\tcl8.5" "%INSTALL_FOLDER%\lib\tcl8.5" /i /d /y /e /q xcopy "%PROJ_DIR%..\..\ext_libs\tcl\lib\x64\tix8.4.3" "%INSTALL_FOLDER%\lib\tix8.4.3" /i /d /y /e /q xcopy "%PROJ_DIR%..\..\ext_libs\tcl\lib\x64\tk8.5" "%INSTALL_FOLDER%\lib\tk8.5" /i /d /y /e /q + copy "%BOOSTROOT%\lib\boost_python-vc120-mt-1_56.dll" "%INSTALL_FOLDER%\bin\boost_python-vc120-mt-1_56.dll" REM if errorlevel 1 goto externalInstallFailed ) @@ -110,6 +111,7 @@ if /i "%BUILD_ARCH%" == "win32" ( xcopy "%PROJ_DIR%..\..\ext_libs\tcl\lib\x86\tcl8.5" "%INSTALL_FOLDER%\lib\tcl8.5" /i /d /y /e /q xcopy "%PROJ_DIR%..\..\ext_libs\tcl\lib\x86\tix8.4.3" "%INSTALL_FOLDER%\lib\tix8.4.3" /i /d /y /e /q xcopy "%PROJ_DIR%..\..\ext_libs\tcl\lib\x86\tk8.5" "%INSTALL_FOLDER%\lib\tk8.5" /i /d /y /e /q + copy "%BOOSTROOT%\lib\boost_python-vc120-mt-1_56.dll" "%INSTALL_FOLDER%\bin\boost_python-vc120-mt-1_56.dll" REM if errorlevel 1 goto externalInstallFailed ) diff --git a/windows/postBuild_nglib.bat b/windows/postBuild_nglib.bat index 3029cd54..c6d29a47 100644 --- a/windows/postBuild_nglib.bat +++ b/windows/postBuild_nglib.bat @@ -69,12 +69,13 @@ if /i "%BUILD_ARCH%" == "x64" ( if /i "%BUILD_ARCH%" == "x64" ( xcopy "%PROJ_DIR%..\..\ext_libs\pthreads-Win32\dll\x64\pthreadVC2.dll" "%INSTALL_FOLDER%\bin" /i /d /y xcopy "%PROJ_DIR%..\..\ext_libs\zlib\x64\lib\zlib1.dll" "%INSTALL_FOLDER%\bin" /i /d /y - + copy "%BOOSTROOT%\lib\boost_python-vc120-mt-1_56.dll" "%INSTALL_FOLDER%\bin\boost_python-vc120-mt-1_56.dll" if errorlevel 1 goto ExternalInstallFailed ) if /i "%BUILD_ARCH%" == "win32" ( xcopy "%PROJ_DIR%..\..\ext_libs\pthreads-Win32\dll\x86\pthreadVC2.dll" "%INSTALL_FOLDER%\bin" /i /d /y xcopy "%PROJ_DIR%..\..\ext_libs\zlib\x86\lib\zlib1.dll" "%INSTALL_FOLDER%\bin" /i /d /y + copy "%BOOSTROOT%\lib\boost_python-vc120-mt-1_56.dll" "%INSTALL_FOLDER%\bin\boost_python-vc120-mt-1_56.dll" if errorlevel 1 goto ExternalInstallFailed )