From 719aebfb8c2bfda69d4d525203e35520e7e63c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 23 Jul 2019 22:57:06 +0200 Subject: [PATCH] Android: Disable building HLSL support in glslang, works around #12105 --- ext/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index b259a6f059..c9bbff9c47 100644 --- 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)