Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[ci] fix windows :/ (again) (#237)

crueter1bdbe2071f6d
diff --git a/.ci/windows/build.sh b/.ci/windows/build.sh
index ac94b38448..6cec119a03 100644
--- a/.ci/windows/build.sh
+++ b/.ci/windows/build.sh
@@ -17,6 +17,11 @@ else
export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_BUNDLED_QT=OFF)
fi
+if [ "$WINDEPLOYQT" == "" ]; then
+ echo "You must supply the WINDEPLOYQT environment variable."
+ exit 1
+fi
+
export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
mkdir -p build && cd build
@@ -36,6 +41,7 @@ cmake .. -G Ninja \
ninja
-windeployqt --release --no-compiler-runtime --no-opengl-sw --no-system-dxc-compiler --no-system-d3d-compiler --dir pkg bin/eden.exe
+$WINDEPLOYQT --release --no-compiler-runtime --no-opengl-sw --no-system-dxc-compiler --no-system-d3d-compiler --dir pkg bin/eden.exe
-find pkg -type f -name "*.pdb" -exec rm -fv {} +
\ No newline at end of file
+set +e
+find pkg -type f -name "*.pdb" -exec rm -fv {} + \; || true
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34c2c9d603..dc015ebe39 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,7 +72,7 @@ jobs:
shell: bash
run: |
./.ci/windows/qt-envvars.sh
- DEVEL=true .ci/windows/build.sh -DCMAKE_PREFIX_PATH=C:/Qt/6.9.0/msvc2022_64/lib/cmake/Qt6
+ DEVEL=true WINDEPLOYQT="/c/Qt/6.9.0/msvc2022_64/bin/windeployqt6.exe" .ci/windows/build.sh -DCMAKE_PREFIX_PATH=C:/Qt/6.9.0/msvc2022_64/lib/cmake/Qt6
- name: Package artifacts
shell: bash