Ninja Attempt bytedeco#2

regice202 · Mar 5, 2023 · ff23130 · ff23130
1 parent 4f939c0
commit ff23130
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/libfreenect2.yml b/.github/workflows/libfreenect2.yml
@@ -94,6 +94,7 @@ jobs:
         #type ./${{ github.workflow }}/cppbuild/${{ github.job }}/libfreenect2-$LIBFREENECT2_VERSION/CMakeFiles/CMakeOutput.log
         run: |
           type ./${{ github.workflow }}/cppbuild/${{ github.job }}/${{ github.workflow }}-0.2.0/CMakeFiles/CMakeOutput.log
+        continue-on-error: true
       - name: Show file structure
         run: |
           tree /f /a

diff --git a/libfreenect2/cppbuild.sh b/libfreenect2/cppbuild.sh
@@ -135,25 +135,26 @@ case $PLATFORM in
         install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @rpath/libusb-1.0.0.dylib ../lib/libfreenect2.dylib
         ;;
     windows-x86_64)
+        export CC="cl.exe"
         cd libusb-$LIBUSB_VERSION
-        ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-w64-mingw32 --disable-udev
-        nmake
-        nmake install
+        CC="cl.exe" CXX="cl.exe" ./configure --prefix="$INSTALL_PATH" --disable-shared --with-pic --host=x86_64-w64-mingw32 --disable-udev
+        ninja -j $MAKEJ
+        ninja install
         cd ../glfw-$GLFW_VERSION
-        "$CMAKE" -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH .
-        nmake
-        nmake install
+        CC="cl.exe" CXX="cl.exe" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" .
+        ninja -j $MAKEJ
+        ninja install
         cd ../$LIBJPEG
-        ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-w64-mingw32
-        nmake
-        nmake install
+        ./configure --prefix="$INSTALL_PATH" --disable-shared --with-pic --host=x86_64-w64-mingw32
+        ninja -j $MAKEJ
+        ninja install
         cd ../cuda-samples-10.1.2
         powershell -command "Get-ChildItem -Recurse -Force -Depth 2 -Include *.h | Move-Item -Destination '..\include' -Force"
         cd ../libfreenect2-$LIBFREENECT2_VERSION
         patch -Np1 < ../../../libfreenect2.patch
-        "$CMAKE" -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DBUILD_OPENNI_DRIVER=OFF -DENABLE_CUDA=ON -DENABLE_CXX11=OFF -DCUDA_TOOLKIT_ROOT_DIR="%ProgramFiles%/NVIDIA GPU Computing Toolkit/CUDA/v$CUDA_VERSION" -DENABLE_OPENCL=OFF -DENABLE_VAAPI=OFF -DENABLE_TEGRAJPEG=OFF -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLibUSB_INCLUDE_DIRS="$INSTALL_PATH/include/libusb-1.0" -DLibUSB_LIBRARIES="$INSTALL_PATH/bin/libusb-1.0.dll" -DGLFW3_INCLUDE_DIRS="$INSTALL_PATH/include" -DGLFW3_LIBRARY="$INSTALL_PATH/bin/glfw3.dll" -DTurboJPEG_INCLUDE_DIRS="$INSTALL_PATH/include" -DTurboJPEG_LIBRARIES="$INSTALL_PATH/bin/turbojpeg.dll" .
-        nmake
-        nmake install
+        CC="cl.exe" CXX="cl.exe" $CMAKE -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DBUILD_OPENNI_DRIVER=OFF -DENABLE_CUDA=ON -DENABLE_CXX11=OFF -DCUDA_TOOLKIT_ROOT_DIR="%ProgramFiles%/NVIDIA GPU Computing Toolkit/CUDA/v$CUDA_VERSION" -DENABLE_OPENCL=OFF -DENABLE_VAAPI=OFF -DENABLE_TEGRAJPEG=OFF -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLibUSB_INCLUDE_DIRS="$INSTALL_PATH/include/libusb-1.0" -DLibUSB_LIBRARIES="$INSTALL_PATH/bin/libusb-1.0.dll" -DGLFW3_INCLUDE_DIRS="$INSTALL_PATH/include" -DGLFW3_LIBRARY="$INSTALL_PATH/bin/glfw3.dll" -DTurboJPEG_INCLUDE_DIRS="$INSTALL_PATH/include" -DTurboJPEG_LIBRARIES="$INSTALL_PATH/bin/turbojpeg.dll" .
+        ninja -j $MAKEJ
+        ninja install
         ;;
     *)
         echo "Error: Platform \"$PLATFORM\" is not supported"