Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[externals] only build spirv-tools as static (#2680)

crueter6a4fa11ac3ad
diff --git a/.ci/android/build.sh b/.ci/android/build.sh
index 4b4c9c0834..836faa38d5 100755
--- a/.ci/android/build.sh
+++ b/.ci/android/build.sh
@@ -13,8 +13,8 @@ fi
cd src/android
chmod +x ./gradlew
-./gradlew assembleRelease
-./gradlew bundleRelease
+./gradlew assembleMainlineRelease
+./gradlew bundleMainlineRelease
if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
rm "${ANDROID_KEYSTORE_FILE}"
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index aa3a97c128..dde8c22d5f 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -117,9 +117,9 @@
},
"spirv-tools": {
"package": "SPIRV-Tools",
- "repo": "KhronosGroup/SPIRV-Tools",
- "tag": "v%VERSION%",
- "hash": "b17940433ced72e004c5eeffd7dd411b6afcc6a52ee31de6427d88edceb8172369be8ec8bf5b65708a78bf41fdae264d554aa7750b2209831679ab36bc867567",
+ "repo": "crueter/SPIRV-Tools",
+ "sha": "2fa2d44485",
+ "hash": "45b198be1d09974ccb2438e8bfa5683f23a0421b058297c28eacfd77e454ec2cf87e77850eddd202efff34b004d8d6b4d12e9615e59bd72be904c196f5eb2169",
"git_version": "2025.4",
"options": [
"SPIRV_SKIP_EXECUTABLES ON"