Merge pull request #12189 from hrydgard/android-arm32-build-workaround

Android: Disable building HLSL support in glslang, works around #12105
hrydgard · Jul 23, 2019 · 163f54e · 163f54e
2 parents 3916f8d + 719aebf
commit 163f54e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -8,6 +8,11 @@ endif()
 set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "let's not build binaries we don't need" FORCE)
 set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON CACHE BOOL "let's not use exceptions" FORCE)
 
+# This is really a workaround for an NDK 20 compiler issue (PPSSPP issue #12105), but shouldn't hurt.
+if(ANDROID)
+set(ENABLE_HLSL OFF CACHE BOOL "let's not build HLSL support we don't need" FORCE)
+endif()
+
 add_subdirectory(glslang)
 add_subdirectory(snappy)
 add_subdirectory(udis86)