Upgrade Boost to 1.86

meshfinity · Aug 30, 2024 · d2759ab · d2759ab
1 parent bf349f7
commit d2759ab
Showing 1 changed file with 23 additions and 7 deletions.
diff --git a/build-win.bat b/build-win.bat
@@ -31,17 +31,33 @@ cmake -G "Visual Studio 17 2022" -A x64 ../
 cmake --build . --config Release
 cd %AUTOREMESHER_BUILD_DIR%
 
-curl -O https://archives.boost.io/release/1.66.0/source/boost_1_66_0.zip
-tar -xf boost_1_66_0.zip
+curl -O https://archives.boost.io/release/1.66.0/source/boost_1_86_0.zip
+tar -xf boost_1_86_0.zip
 mkdir %AUTOREMESHER_BUILD_DIR%\Libraries
-echo D | xcopy boost_1_66_0 %AUTOREMESHER_BUILD_DIR%\Libraries\boost_1_66_0 /s /e /q /y
+echo D | xcopy boost_1_86_0 %AUTOREMESHER_BUILD_DIR%\Libraries\boost_1_86_0 /s /e /q /y
 
 cd thirdparty/openvdb/openvdb-7.0.0
 mkdir build
 cd build
-cmake -G "Visual Studio 17 2022" -A x64 -D "OPENVDB_CORE_STATIC=OFF" -D "OPENVDB_BUILD_CORE=ON" -D "OPENVDB_BUILD_BINARIES=ON" -D "IlmBase_INCLUDE_DIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/openexr/openexr-2.4.1" -D "IlmBase_Half_LIBRARY=%AUTOREMESHER_BUILD_DIR%/thirdparty/openexr/openexr-2.4.1/build/IlmBase/Half/Release/Half-2_4.lib" -D "TBB_INCLUDEDIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/tbb/include" -D "TBB_LIBRARYDIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/tbb/build2/Release" -D "ZLIB_INCLUDE_DIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/zlib/zlib-1.2.11" -D "ZLIB_LIBRARY=%AUTOREMESHER_BUILD_DIR%/thirdparty/zlib/zlib-1.2.11/build/Release/zlibstatic.lib" -D "Blosc_INCLUDE_DIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/blosc/c-blosc-1.18.1" -D "Blosc_LIBRARY=%AUTOREMESHER_BUILD_DIR%/thirdparty/blosc/c-blosc-1.18.1/build/blosc/Release/libblosc.lib" -D "BOOST_INCLUDEDIR=%AUTOREMESHER_BUILD_DIR%/Libraries/boost_1_66_0" -D "OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING=ON" -D "CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=%AUTOREMESHER_BUILD_DIR%/Libraries/boost_1_66_0;%AUTOREMESHER_BUILD_DIR%/thirdparty/blosc/c-blosc-1.18.1/blosc;%AUTOREMESHER_BUILD_DIR%/thirdparty/zlib/zlib-1.2.11/build" ../
+cmake -G "Visual Studio 17 2022" -A x64 -D "OPENVDB_CORE_STATIC=OFF" -D "OPENVDB_BUILD_CORE=ON" -D "OPENVDB_BUILD_VDB_PRINT=OFF" -D "IlmBase_INCLUDE_DIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/openexr/openexr-2.4.1" -D "IlmBase_Half_LIBRARY=%AUTOREMESHER_BUILD_DIR%/thirdparty/openexr/openexr-2.4.1/build/IlmBase/Half/Release/Half-2_4.lib" -D "TBB_INCLUDEDIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/tbb/include" -D "TBB_LIBRARYDIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/tbb/build2/Release" -D "ZLIB_INCLUDE_DIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/zlib/zlib-1.2.11" -D "ZLIB_LIBRARY=%AUTOREMESHER_BUILD_DIR%/thirdparty/zlib/zlib-1.2.11/build/Release/zlibstatic.lib" -D "Blosc_INCLUDE_DIR=%AUTOREMESHER_BUILD_DIR%/thirdparty/blosc/c-blosc-1.18.1" -D "Blosc_LIBRARY=%AUTOREMESHER_BUILD_DIR%/thirdparty/blosc/c-blosc-1.18.1/build/blosc/Release/libblosc.lib" -D "BOOST_INCLUDEDIR=%AUTOREMESHER_BUILD_DIR%/Libraries/boost_1_86_0" -D "OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING=ON" -D "CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=%AUTOREMESHER_BUILD_DIR%/Libraries/boost_1_86_0;%AUTOREMESHER_BUILD_DIR%/thirdparty/blosc/c-blosc-1.18.1/blosc;%AUTOREMESHER_BUILD_DIR%/thirdparty/zlib/zlib-1.2.11/build" ../
 cmake --build . --config Release
-cmake --build . --target install
 cd %AUTOREMESHER_BUILD_DIR%
-if not exist "release" mkdir release
-echo D | xcopy thirdparty\openvdb\openvdb-7.0.0 release\openvdb-7.0.0 /s /e /q /y
+
+mkdir %AUTOREMESHER_BUILD_DIR%\Qt
+cd %AUTOREMESHER_BUILD_DIR%\Qt
+curl -O -L https://github.com/miurahr/aqtinstall/releases/download/Continuous/aqt.exe
+aqt install-qt windows desktop 5.13.2 win64_msvc2017_64
+cd %AUTOREMESHER_BUILD_DIR%
+
+set QTDIR=%AUTOREMESHER_BUILD_DIR%\Qt\5.13.2\msvc2017_64
+set PATH=%PATH%;%QTDIR%\bin
+qmake "BOOST_INCLUDEDIR=%AUTOREMESHER_BUILD_DIR%\Libraries\boost_1_86_0" "CGAL_DIR=%AUTOREMESHER_BUILD_DIR%\thirdparty\cgal\CGAL-5.1-beta1"
+nmake -f Makefile.Release
+
+copy thirdparty\openvdb\openvdb-7.0.0\build\openvdb\Release\openvdb.dll release\openvdb.dll
+copy thirdparty\tbb\build2\Release\tbbmalloc_proxy.dll release\tbbmalloc_proxy.dll
+copy thirdparty\tbb\build2\Release\tbbmalloc.dll release\tbbmalloc.dll
+copy thirdparty\tbb\build2\Release\tbb.dll release\tbb.dll
+copy thirdparty\zlib\zlib-1.2.11\build\Release\zlib.dll release\zlib.dll
+copy thirdparty\cgal\CGAL-5.1-beta1\auxiliary\gmp\lib\libgmp-10.dll release\libgmp-10.dll
+copy thirdparty\cgal\CGAL-5.1-beta1\auxiliary\gmp\lib\libmpfr-4.dll release\libmpfr-4.dll