From d2645e9087e841b2e3073e07c9c9607734b8000c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 1 Mar 2016 19:19:39 +0100 Subject: [PATCH] Add more glslang include dirs --- gfx/drivers_shader/glslang_util.cpp | 4 ++-- pkg/android/phoenix/jni/Android.mk | 5 ++++- pkg/android/phoenix/jni/Android2.mk | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gfx/drivers_shader/glslang_util.cpp b/gfx/drivers_shader/glslang_util.cpp index 8560968161..2e48826ebc 100644 --- a/gfx/drivers_shader/glslang_util.cpp +++ b/gfx/drivers_shader/glslang_util.cpp @@ -21,8 +21,8 @@ #include "glslang.hpp" #include "../../general.h" -#include "libretro-common/include/retro_file.h" -#include "libretro-common/include/string/string_list.h" +#include +#include using namespace std; diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index c2faddac0e..270cb14947 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -74,7 +74,10 @@ ifeq ($(HAVE_VULKAN),1) INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include LOCAL_C_INCLUDES += $(INCFLAGS) -LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/Public +LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang \ + -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/Public \ + -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent \ + -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/SPIRV endif LOCAL_LDLIBS += -lOpenSLES -lz diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk index 7b47b2947b..57fb8428db 100644 --- a/pkg/android/phoenix/jni/Android2.mk +++ b/pkg/android/phoenix/jni/Android2.mk @@ -79,7 +79,10 @@ ifeq ($(HAVE_VULKAN),1) INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include LOCAL_C_INCLUDES += $(INCFLAGS) -LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/Public +LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang \ + -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/Public \ + -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent \ + -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/SPIRV endif LOCAL_LDLIBS += -lOpenSLES -lz