diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index edfb665..fd1bf56 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: - name: Install System Packages uses: ConorMacBride/install-package@v1 with: - apt: libgl-dev libxcb-glx0-dev libglu1-mesa-dev libxxf86vm-dev libxrandr-dev + apt: libxmu-dev libxi-dev libgl-dev libxcb-glx0-dev libglu1-mesa-dev libxxf86vm-dev libxrandr-dev - name: Install CMake uses: lukka/get-cmake@latest - name: Install Vcpkg Packages @@ -35,17 +35,22 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Install CMake uses: lukka/get-cmake@latest - - name: Install Vcpkg Packages - uses: lukka/run-vcpkg@v11 - with: - vcpkgJsonGlob: 'vcpkg.json' - - name: Configure and Build - uses: lukka/run-cmake@v10 - with: - configurePreset: 'msvc-vcpkg' - buildPreset: 'msvc-vcpkg-release' + - name: bootstrap vcpkg + working-directory: vcpkg + run: bootstrap-vcpkg.bat + - name: vcpkg install (manifest mode) + shell: cmd + run: vcpkg\vcpkg.exe install + - name: create build dir + run: mkdir build + - name: cmake configure + working-directory: build + run: cmake -DSHIPPING=ON -DCMAKE_TOOLCHAIN_FILE="../vcpkg/scripts/buildsystems/vcpkg.cmake" .. + - name: cmake build + working-directory: build + run: cmake --build . config=Release - name: Upload Artifiacts uses: actions/upload-artifact@v4 with: name: windows-build - path: builds/msvc-vcpkg/Release + path: build/Release diff --git a/.gitignore b/.gitignore index 13a67c8..19832b2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ meta-quest/ovr_openxr_mobile_sdk_59.0.zip data/* !data/test.ply !data/test_vr.json +vcpkg_installed/ # ignore archived release zip splatapult*.zip diff --git a/vcpkg b/vcpkg index ab887c5..1b2372f 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit ab887c562326c686478284d9076d722c1ec4b48c +Subproject commit 1b2372fdd420185c6f516541b81228c55061dca4