* Update presets for Visual Studio 2019

bytedeco · Nov 24, 2020 · 1d22113 · 1d22113 · kyrill007 · Nov 24, 2020
1 parent f929dc2
commit 1d22113
Show file tree

Hide file tree

Showing 18 changed files with 144 additions and 75 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,6 +1,6 @@
 version: '{build}'
 
-os: Visual Studio 2017
+os: Visual Studio 2019
 
 cache:
   - C:\Users\appveyor\.m2 -> .appveyor.yml
@@ -73,7 +73,6 @@ environment:
       OS: windows-x86_64
     - PROJ: "mxnet"
       OS: windows-x86_64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - PROJ: "tensorflow"
       OS: windows-x86_64
     - PROJ: "tensorrt"
@@ -97,7 +96,6 @@ environment:
     - PROJ: "mxnet"
       OS: windows-x86_64
       EXT: -gpu
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 #    - PROJ: "tensorflow"
 #      OS: windows-x86_64
 #      EXT: -gpu

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Update presets for Visual Studio 2019 on Windows
  * Add presets for TVM 0.7.0
  * Include `free()` in presets for FTTW as required by `fftw_export_wisdom_to_string()` ([issue bytedeco/javacpp#429](https://github.com/bytedeco/javacpp/issues/429))
  * Include all missing header files from the `opencv_ximgproc` module ([issue #958](https://github.com/bytedeco/javacpp-presets/issues/958))

diff --git a/arpack-ng/cppbuild.sh b/arpack-ng/cppbuild.sh
@@ -94,12 +94,12 @@ case $PLATFORM in
         make install-strip
         ;;
     windows-x86)
-        CC="gcc -m32" CXX="g++ -m32" FC="gfortran -m32 -static-libgcc -static-libgfortran -Wl,-Bstatic,--whole-archive,--allow-multiple-definition -lwinpthread -lquadmath -lgfortran -Wl,-Bdynamic,--no-whole-archive" F77="$FC" FLIBS="-lgfortran" ./configure --prefix=$INSTALL_PATH --enable-icb --with-blas=openblas --with-lapack=openblas --build=i686-w64-mingw32
+        CC="gcc -m32" CXX="g++ -m32" FC="gfortran -fallow-argument-mismatch -m32 -static-libgcc -static-libgfortran -Wl,-Bstatic,--whole-archive,--allow-multiple-definition -lwinpthread -lquadmath -lgfortran -Wl,-Bdynamic,--no-whole-archive" F77="$FC" FLIBS="-lgfortran" ./configure --prefix=$INSTALL_PATH --enable-icb --with-blas=openblas --with-lapack=openblas --build=i686-w64-mingw32
         make -j $MAKEJ
         make install-strip
         ;;
     windows-x86_64)
-        CC="gcc -m64" CXX="g++ -m64" FC="gfortran -m64 -static-libgcc -static-libgfortran -Wl,-Bstatic,--whole-archive,--allow-multiple-definition -lwinpthread -lquadmath -lgfortran -Wl,-Bdynamic,--no-whole-archive" F77="$FC" FLIBS="-lgfortran" ./configure --prefix=$INSTALL_PATH --enable-icb --with-blas=openblas --with-lapack=openblas --build=x86_64-w64-mingw32
+        CC="gcc -m64" CXX="g++ -m64" FC="gfortran -fallow-argument-mismatch -m64 -static-libgcc -static-libgfortran -Wl,-Bstatic,--whole-archive,--allow-multiple-definition -lwinpthread -lquadmath -lgfortran -Wl,-Bdynamic,--no-whole-archive" F77="$FC" FLIBS="-lgfortran" ./configure --prefix=$INSTALL_PATH --enable-icb --with-blas=openblas --with-lapack=openblas --build=x86_64-w64-mingw32
         make -j $MAKEJ
         make install-strip
         ;;

diff --git a/arrow/arrow.patch b/arrow/arrow.patch
@@ -1,18 +1,18 @@
-diff -ruN apache-arrow-1.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake apache-arrow-1.0.0-patch/cpp/cmake_modules/ThirdpartyToolchain.cmake
---- apache-arrow-1.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake	2020-07-21 06:14:01.000000000 +0900
-+++ apache-arrow-1.0.0-patch/cpp/cmake_modules/ThirdpartyToolchain.cmake	2020-07-28 11:04:06.266711222 +0900
-@@ -1030,6 +1030,7 @@
+diff -ruN apache-arrow-2.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake apache-arrow-2.0.0-patch/cpp/cmake_modules/ThirdpartyToolchain.cmake
+--- apache-arrow-2.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake	2020-10-13 09:04:59.000000000 +0900
++++ apache-arrow-2.0.0-patch/cpp/cmake_modules/ThirdpartyToolchain.cmake	2020-11-21 23:43:42.659393097 +0900
+@@ -1084,6 +1084,7 @@
    set(GLOG_CMAKE_ARGS
        ${EP_COMMON_CMAKE_ARGS}
        "-DCMAKE_INSTALL_PREFIX=${GLOG_BUILD_DIR}"
 +      -DCMAKE_INSTALL_LIBDIR=lib
        -DBUILD_SHARED_LIBS=OFF
        -DBUILD_TESTING=OFF
        -DWITH_GFLAGS=OFF
-diff -ruN apache-arrow-1.0.0/cpp/src/arrow/compute/kernel.h apache-arrow-1.0.0-patch/cpp/src/arrow/compute/kernel.h
---- apache-arrow-1.0.0/cpp/src/arrow/compute/kernel.h	2020-07-21 06:14:02.000000000 +0900
-+++ apache-arrow-1.0.0-patch/cpp/src/arrow/compute/kernel.h	2020-08-04 13:03:02.258780909 +0900
-@@ -627,7 +627,7 @@
+diff -ruN apache-arrow-2.0.0/cpp/src/arrow/compute/kernel.h apache-arrow-2.0.0-patch/cpp/src/arrow/compute/kernel.h
+--- apache-arrow-2.0.0/cpp/src/arrow/compute/kernel.h	2020-10-13 09:05:00.000000000 +0900
++++ apache-arrow-2.0.0-patch/cpp/src/arrow/compute/kernel.h	2020-11-21 23:43:42.660393132 +0900
+@@ -626,7 +626,7 @@
          finalize(std::move(finalize)) {}
 
    VectorKernel(std::shared_ptr<KernelSignature> sig, ArrayKernelExec exec,
@@ -21,3 +21,26 @@ diff -ruN apache-arrow-1.0.0/cpp/src/arrow/compute/kernel.h apache-arrow-1.0.0-p
        : ArrayKernel(std::move(sig), std::move(exec), std::move(init)),
          finalize(std::move(finalize)) {}
 
+diff -ruN apache-arrow-2.0.0/cpp/src/arrow/vendored/datetime/date.h apache-arrow-2.0.0-patch/cpp/src/arrow/vendored/datetime/date.h
+--- apache-arrow-2.0.0/cpp/src/arrow/vendored/datetime/date.h	2020-10-13 09:05:00.000000000 +0900
++++ apache-arrow-2.0.0-patch/cpp/src/arrow/vendored/datetime/date.h	2020-11-22 17:15:47.247032875 +0900
+@@ -109,7 +109,7 @@
+ #    define CONSTDATA const
+ #    define CONSTCD11
+ #    define CONSTCD14
+-#    define NOEXCEPT _NOEXCEPT
++#    define NOEXCEPT
+ #  else
+ //   VS2017 and later
+ #    define CONSTDATA constexpr const
+diff -ruN apache-arrow-2.0.0/cpp/src/gandiva/engine.cc apache-arrow-2.0.0-patch/cpp/src/gandiva/engine.cc
+--- apache-arrow-2.0.0/cpp/src/gandiva/engine.cc	2020-10-13 09:05:00.000000000 +0900
++++ apache-arrow-2.0.0-patch/cpp/src/gandiva/engine.cc	2020-11-21 23:44:23.656925805 +0900
+@@ -53,6 +53,7 @@
+ #include <llvm/Linker/Linker.h>
+ #include <llvm/MC/SubtargetFeature.h>
+ #include <llvm/Support/DynamicLibrary.h>
++#include <llvm/Support/Host.h>
+ #include <llvm/Support/TargetRegistry.h>
+ #include <llvm/Support/TargetSelect.h>
+ #include <llvm/Support/raw_ostream.h>
diff --git a/arrow/cppbuild.sh b/arrow/cppbuild.sh
@@ -12,7 +12,7 @@ if [[ $PLATFORM == windows* ]]; then
     export PYTHON_BIN_PATH=$(which python.exe)
 fi
 
-LLVM_VERSION=10.0.1
+LLVM_VERSION=11.0.0
 OPENSSL_VERSION=1.1.1g
 ZLIB_VERSION=1.2.11
 PROTO_VERSION=3.7.1
@@ -36,7 +36,9 @@ tar --totals -xzf ../openssl-$OPENSSL_VERSION.tar.gz
 tar --totals -xf ../llvm-$LLVM_VERSION.src.tar.xz || tar --totals -xf ../llvm-$LLVM_VERSION.src.tar.xz
 cd apache-arrow-$ARROW_VERSION
 patch -Np1 < ../../../arrow.patch
+sedinplace 's/ARROW_LLVM_VERSIONS "10"/ARROW_LLVM_VERSIONS "11" "10"/g' cpp/CMakeLists.txt
 cd ../llvm-$LLVM_VERSION.src
+sedinplace '/find_package(Git/d' cmake/modules/AddLLVM.cmake cmake/modules/VersionFromVCS.cmake
 mkdir -p build tools
 cd tools
 tar --totals -xf ../../../clang-$LLVM_VERSION.src.tar.xz || tar --totals -xf ../../../clang-$LLVM_VERSION.src.tar.xz

diff --git a/ci/install-windows.sh b/ci/install-windows.sh
@@ -154,9 +154,9 @@ cp -a "/c/Python37-x64" "/C/Program Files/Python37"
 cp -a "/c/Python38-x64" "/C/Program Files/Python38"
 
 # install an older less buggy version of GCC
-/c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1CmH1Eq0LoAQQ5mWaqYiU9kYOfMGjLXlz /c/Downloads/mingw-w64-old.tar
-tar xvf /c/Downloads/mingw-w64-old.tar
-pacman -U --noconfirm *.pkg.tar.xz
+#/c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1CmH1Eq0LoAQQ5mWaqYiU9kYOfMGjLXlz /c/Downloads/mingw-w64-old.tar
+#tar xvf /c/Downloads/mingw-w64-old.tar
+#pacman -U --noconfirm *.pkg.tar.xz
 
 # get rid of some stuff we don't use to avoid running out of disk space and that may actually interfere with our builds
 rm -Rf /c/go*
@@ -172,6 +172,15 @@ rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ DirectX\ SDK*
 rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/Community/VC/Tools/MSVC/14.12*
 rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/Community/VC/Redist/MSVC/14.12*
 rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/Community/VC/Auxiliary/Build/14.12/
+rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Tools/MSVC/14.16*
+rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Redist/MSVC/14.16*
+rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Auxiliary/Build/14.16/
+rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Tools/MSVC/14.2[01234567]*
+rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Redist/MSVC/14.2[01234567]*
+rm -Rf /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Auxiliary/Build/14.2[01234567]/
+ls -l /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Tools/MSVC/
+ls -l /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Redist/MSVC/
+ls -l /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Auxiliary/Build/
 rm -Rf /usr/bin/link.exe
 pacman -Rc --noconfirm python python2 mingw-w64-i686-python3 mingw-w64-x86_64-python3
 df -h

diff --git a/dnnl/cppbuild.sh b/dnnl/cppbuild.sh
@@ -68,6 +68,8 @@ case $PLATFORM in
         install_name_tool -change @rpath/libomp.dylib @rpath/libiomp5.dylib ../lib/libdnnl.dylib
         ;;
     windows-x86_64)
+        export CC="cl.exe"
+        export CXX="cl.exe"
         if [[ "$DNNL_CPU_RUNTIME" == "TBB" ]]; then
             cd ../oneTBB-$TBB_VERSION
             patch -Np1 < ../../../tbb-windows.patch
@@ -81,8 +83,9 @@ case $PLATFORM in
             cp -a build/*debug/tbb_debug.lib ../lib/intel64/vc14/
             cd ../oneDNN-$MKLDNN_VERSION
         fi
-        "$CMAKE" -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_INSTALL_LIBDIR="lib" -DARCH_OPT_FLAGS='' -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_BUILD_TESTS=OFF -DDNNL_CPU_RUNTIME=$DNNL_CPU_RUNTIME -DTBBROOT=$INSTALL_PATH .
-        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release //p:CL_MPCount=$MAKEJ
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_INSTALL_LIBDIR="lib" -DARCH_OPT_FLAGS='' -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_BUILD_TESTS=OFF -DDNNL_CPU_RUNTIME=$DNNL_CPU_RUNTIME -DTBBROOT=$INSTALL_PATH .
+        ninja -j $MAKEJ
+        ninja install
         ;;
     *)
         echo "Error: Platform \"$PLATFORM\" is not supported"

diff --git a/hdf5/cppbuild.sh b/hdf5/cppbuild.sh
@@ -108,19 +108,27 @@ case $PLATFORM in
     windows-x86)
         mkdir -p build
         cd build
-        "$CMAKE" -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ" -DZLIB_TGZ_NAME:STRING="$ZLIB.tar.gz" -DTGZPATH:STRING="$INSTALL_PATH/.." -DHDF5_ENABLE_Z_LIB_SUPPORT=ON ..
-        sedinplace 's/libzlib.lib/zlibstatic.lib/g' src/hdf5-shared.vcxproj
-        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release //p:CL_MPCount=$MAKEJ
-        cp bin/Release/zlib* ../../lib/
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ" -DZLIB_TGZ_NAME:STRING="$ZLIB.tar.gz" -DTGZPATH:STRING="$INSTALL_PATH/.." -DHDF5_ENABLE_Z_LIB_SUPPORT=ON ..
+        sedinplace 's/Release\\libzlib.lib/zlibstatic.lib/g' build.ninja
+        ninja -j $MAKEJ ZLIB
+        ninja -j $MAKEJ
+        ninja install
+        cp bin/zlib* ../../lib/
         cd ..
         ;;
     windows-x86_64)
         mkdir -p build
         cd build
-        "$CMAKE" -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ" -DZLIB_TGZ_NAME:STRING="$ZLIB.tar.gz" -DTGZPATH:STRING="$INSTALL_PATH/.." -DHDF5_ENABLE_Z_LIB_SUPPORT=ON ..
-        sedinplace 's/libzlib.lib/zlibstatic.lib/g' src/hdf5-shared.vcxproj
-        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release //p:CL_MPCount=$MAKEJ
-        cp bin/Release/zlib* ../../lib/
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBUILD_TESTING=false -DHDF5_BUILD_EXAMPLES=false -DHDF5_BUILD_TOOLS=false -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ" -DZLIB_TGZ_NAME:STRING="$ZLIB.tar.gz" -DTGZPATH:STRING="$INSTALL_PATH/.." -DHDF5_ENABLE_Z_LIB_SUPPORT=ON ..
+        sedinplace 's/Release\\libzlib.lib/zlibstatic.lib/g' build.ninja
+        ninja -j $MAKEJ ZLIB
+        ninja -j $MAKEJ
+        ninja install
+        cp bin/zlib* ../../lib/
         cd ..
         ;;
     *)

diff --git a/hyperscan/cppbuild.sh b/hyperscan/cppbuild.sh
@@ -41,8 +41,10 @@ case $PLATFORM in
         make install/strip
         ;;
     windows-x86_64)
-        CXXFLAGS="/Wv:17" "$CMAKE" -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DARCH_OPT_FLAGS='' .
-        MSBuild.exe hyperscan.sln //p:Configuration=Release //p:Platform=x64
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        CXXFLAGS="/Wv:17" "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DARCH_OPT_FLAGS='' .
+        ninja -j $MAKEJ
         cp -r src/* $INSTALL_PATH/include/hs/
         cp lib/*.lib $INSTALL_PATH/lib
         ;;

diff --git a/libpostal/cppbuild.sh b/libpostal/cppbuild.sh
@@ -21,6 +21,9 @@ if [[ "${ACLOCAL_PATH:-}" == C:\\msys64\\* ]]; then
     export ACLOCAL_PATH=/mingw64/share/aclocal:/usr/share/aclocal
 fi
 
+# Work around build issues on Windows
+sedinplace '/_rand48_/d' src/klib/drand48.h
+
 case $PLATFORM in
     linux-x86_64)
         ./bootstrap.sh

diff --git a/librealsense/cppbuild.sh b/librealsense/cppbuild.sh
@@ -70,16 +70,20 @@ case $PLATFORM in
         make install/strip
         ;;
     windows-x86)
-        PKG_CONFIG_PATH="../lib/pkgconfig" "$CMAKE" -G "Visual Studio 15 2017" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF .
-        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        PKG_CONFIG_PATH="../lib/pkgconfig" "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF .
+        ninja -j $MAKEJ
         cp -a include/* ../include/
-        cp -a Release/* ../lib/
+        cp -a *.lib *.dll ../lib/
         ;;
     windows-x86_64)
-        PKG_CONFIG_PATH="../lib/pkgconfig" "$CMAKE" -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF .
-        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        PKG_CONFIG_PATH="../lib/pkgconfig" "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF .
+        ninja -j $MAKEJ
         cp -a include/* ../include/
-        cp -a Release/* ../lib/
+        cp -a *.lib *.dll ../lib/
         ;;
     *)
         echo "Error: Platform \"$PLATFORM\" is not supported"

diff --git a/librealsense2/cppbuild.sh b/librealsense2/cppbuild.sh
@@ -73,20 +73,24 @@ case $PLATFORM in
     windows-x86)
         mkdir -p build
         cd build
-        "$CMAKE" -G "Visual Studio 15 2017" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
-        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
+        ninja -j $MAKEJ
         cd ..
         cp -a include/* ../include/
-        cp -a build/Release/* ../lib/
+        cp -a build/* ../lib/
         ;;
     windows-x86_64)
         mkdir -p build
         cd build
-        "$CMAKE" -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
-        MSBuild.exe INSTALL.vcxproj //p:Configuration=Release
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        "$CMAKE" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF ..
+        ninja -j $MAKEJ
         cd ..
         cp -a include/* ../include/
-        cp -a build/Release/* ../lib/
+        cp -a build/* ../lib/
         ;;
     *)
         echo "Error: Platform \"$PLATFORM\" is not supported"

diff --git a/liquidfun/cppbuild.sh b/liquidfun/cppbuild.sh
@@ -35,19 +35,21 @@ case $PLATFORM in
         ;;
     windows-x86)
         cd liquidfun/Box2D
-        CXXFLAGS="/Wv:17" $CMAKE -G "Visual Studio 15 2017" -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF .
-        MSBuild.exe Box2D.sln //p:Configuration=Release //p:Platform=Win32 //p:CL_MPCount=$MAKEJ
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        CXXFLAGS="/Wv:17" $CMAKE -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF .
+        ninja -j $MAKEJ
         cp -r Box2D $INSTALL_PATH/include
-        cp Box2D/Release/*.lib $INSTALL_PATH/lib
-        cp Box2D/Release/*.dll $INSTALL_PATH/bin
+        cp Box2D/*.lib $INSTALL_PATH/lib
         ;;
     windows-x86_64)
         cd liquidfun/Box2D
-        CXXFLAGS="/Wv:17" $CMAKE -G "Visual Studio 15 2017 Win64" -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF .
-        MSBuild.exe Box2D.sln //p:Configuration=Release //p:Platform=x64 //p:CL_MPCount=$MAKEJ
+        export CC="cl.exe"
+        export CXX="cl.exe"
+        CXXFLAGS="/Wv:17" $CMAKE -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF .
+        ninja -j $MAKEJ
         cp -r Box2D $INSTALL_PATH/include
-        cp Box2D/Release/*.lib $INSTALL_PATH/lib
-        cp Box2D/Release/*.dll $INSTALL_PATH/bin
+        cp Box2D/*.lib $INSTALL_PATH/lib
         ;;
     macosx-*)
         cd liquidfun/Box2D