diff --git a/.github/workflows/uwp.yml b/.github/workflows/uwp.yml index 46a4dd20b9..3616be7900 100644 --- a/.github/workflows/uwp.yml +++ b/.github/workflows/uwp.yml @@ -6,30 +6,15 @@ jobs: build: runs-on: windows-latest - env: - VCPKG_ROOT: ${{ github.workspace }}/vcpkg - VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg/bincache - steps: - uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true - - name: bootstrap vcpkg - run: | - git clone https://github.com/microsoft/vcpkg - mkdir vcpkg\bincache - vcpkg\bootstrap-vcpkg.bat - - - uses: actions/cache@v4 - with: - path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} - key: vcpkg-${{ hashFiles( 'vcpkg.json' ) }} - - name: CMake run: | - cmake -B build -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.22000.0 -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake + cmake -B build -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.22000.0 cmake --build build --config Release --parallel 2 shell: cmd diff --git a/core/deps/SDL b/core/deps/SDL index 15ead9a40d..859844eae3 160000 --- a/core/deps/SDL +++ b/core/deps/SDL @@ -1 +1 @@ -Subproject commit 15ead9a40d09a1eb9972215cceac2bf29c9b77f6 +Subproject commit 859844eae358447be8d66e6da59b6fb3df0ed778 diff --git a/vcpkg.json b/vcpkg.json deleted file mode 100644 index b4b39a6b04..0000000000 --- a/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "flycast", - "version-string": "1.2.0-dev", - "dependencies": [ - "sdl2" - ] -} \ No newline at end of file