mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add more glslang include dirs

Browse Source
This commit is contained in:
twinaphex 2016-03-01 19:19:39 +01:00
parent 800d54a7fb
commit d2645e9087
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_shader/glslang_util.cpp
View File

@ -21,8 +21,8 @@
#include "glslang.hpp" #include "glslang.hpp"
#include "../../general.h" #include "../../general.h"
#include "libretro-common/include/retro_file.h" #include <retro_file.h>
#include "libretro-common/include/string/string_list.h" #include <string/string_list.h>
using namespace std; using namespace std;

5
pkg/android/phoenix/jni/Android.mk
View File

@ -74,7 +74,10 @@ ifeq ($(HAVE_VULKAN),1)
INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include
LOCAL_C_INCLUDES += $(INCFLAGS) 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 endif
LOCAL_LDLIBS += -lOpenSLES -lz LOCAL_LDLIBS += -lOpenSLES -lz

5
pkg/android/phoenix/jni/Android2.mk
View File

@ -79,7 +79,10 @@ ifeq ($(HAVE_VULKAN),1)
INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include
LOCAL_C_INCLUDES += $(INCFLAGS) 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 endif
LOCAL_LDLIBS += -lOpenSLES -lz LOCAL_LDLIBS += -lOpenSLES -lz