DX

Author: mkalkbrenner

.github/workflows/ppuc.yml

@@ -26,10 +26,29 @@ jobs:
           echo "${TAG}"
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
 
+  dxsdk:
+    name: DirectX SDK
+    runs-on: windows-latest
+    steps:
+      - id: cache
+        uses: actions/cache@v4
+        with:
+          path: DXSDK
+          key: cache-dxsdk
+      - if: steps.cache.outputs.cache-hit != 'true'
+        name: Create Cache
+        run: |
+          curl -sL https://download.microsoft.com/download/a/e/7/ae743f1f-632b-4809-87a9-aa1bb3458e31/DXSDK_Jun10.exe -o DXSDK_Jun10.exe
+          7z x DXSDK_Jun10.exe DXSDK/Include -otmp
+          7z x DXSDK_Jun10.exe DXSDK/Lib -otmp
+          mv tmp/DXSDK DXSDK
+          rm -fR DXSDK_Jun10.exe tmp
+          ls -Ra DXSDK
+
   build:
     name: Build ppuc-${{ matrix.platform }}-${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
-    needs: [ version ]
+    needs: [ version, dxsdk ]
     strategy:
       fail-fast: false
       matrix:
@@ -57,6 +76,11 @@ jobs:
       - if: (matrix.platform == 'win')
         name: Add msbuild to path (win runner)
         uses: microsoft/setup-msbuild@v2
+      - if: (matrix.platform == 'win')
+        uses: actions/cache@v4
+        with:
+          path: DXSDK
+          key: cache-dxsdk
       - if: (matrix.platform == 'macos')
         name: Add autoconf and automake (mac runner)
         run: |
@@ -67,6 +91,9 @@ jobs:
       - if: (!(matrix.platform == 'linux' && matrix.arch == 'aarch64'))
         name: Build ppuc-${{ matrix.platform }}-${{ matrix.arch }}
         run: |
+          if [[ "${{ matrix.platform }}" == "win" ]]; then
+            export DXSDK_DIR="${GITHUB_WORKSPACE}/DXSDK"
+          fi
           ./platforms/${{ matrix.platform }}/${{ matrix.arch }}/build.sh
       - if: (matrix.platform == 'linux' && matrix.arch == 'aarch64')
         name: Build ppuc-${{ matrix.platform }}-${{ matrix.arch }} (arm runner)

platforms/win/x64/external.sh

@@ -47,7 +47,6 @@ if [ "${SDL3_EXPECTED_SHA}" != "${SDL3_FOUND_SHA}" ]; then
       -DSDL_SHARED=ON \
       -DSDL_STATIC=OFF \
       -DSDL_TEST_LIBRARY=OFF \
-      -DSDL_JOYSTICK=OFF \
       -B build
    cmake --build build --config ${BUILD_TYPE}
    cd ..