From 234102d47524f61dae967d5f9b656776c0278bf3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 25 Jun 2018 16:52:15 +0200 Subject: [PATCH] (glslang) Buildfix for Android --- griffin/griffin_cpp.cpp | 6 ++++-- griffin/griffin_glslang.cpp | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index c0617f267f..970ac5cffe 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -50,11 +50,13 @@ VIDEO DRIVER #include "../gfx/drivers_shader/shader_vulkan.cpp" #endif -#ifdef HAVE_SPIRV_CROSS +#if defined(HAVE_SPIRV_CROSS) +#if defined(ENABLE_HLSL) +#include "../deps/SPIRV-Cross/spirv_hlsl.cpp" +#endif #include "../deps/SPIRV-Cross/spirv_cross.cpp" #include "../deps/SPIRV-Cross/spirv_cfg.cpp" #include "../deps/SPIRV-Cross/spirv_glsl.cpp" -#include "../deps/SPIRV-Cross/spirv_hlsl.cpp" #include "../deps/SPIRV-Cross/spirv_msl.cpp" #ifdef HAVE_SLANG #include "../gfx/drivers_shader/glslang_util.cpp" diff --git a/griffin/griffin_glslang.cpp b/griffin/griffin_glslang.cpp index 45da52e72c..98dd96f55a 100644 --- a/griffin/griffin_glslang.cpp +++ b/griffin/griffin_glslang.cpp @@ -1,5 +1,6 @@  #ifdef WANT_GLSLANG + #ifdef _MSC_VER #include #ifdef strtoull @@ -54,6 +55,7 @@ #include "../deps/glslang/glslang/glslang/OSDependent/Unix/ossource.cpp" #endif +#if defined(ENABLE_HLSL) #include "../deps/glslang/glslang/hlsl/hlslAttributes.cpp" #include "../deps/glslang/glslang/hlsl/hlslGrammar.cpp" #include "../deps/glslang/glslang/hlsl/hlslOpMap.cpp" @@ -62,3 +64,5 @@ #include "../deps/glslang/glslang/hlsl/hlslScanContext.cpp" #include "../deps/glslang/glslang/hlsl/hlslTokenStream.cpp" #endif + +#endif