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

(Android) Start setting up include dirs

Browse Source
This commit is contained in:
twinaphex 2016-03-01 19:04:20 +01:00
parent 77001a5577
commit 800d54a7fb
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ HAVE_NEON := 1
HAVE_LOGGER := 0 HAVE_LOGGER := 0
HAVE_VULKAN := 0 HAVE_VULKAN := 0
INCFLAGS :=
DEFINES := DEFINES :=
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -70,7 +71,10 @@ LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS
LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
ifeq ($(HAVE_VULKAN),1) ifeq ($(HAVE_VULKAN),1)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include
LOCAL_C_INCLUDES += $(INCFLAGS)
LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/Public
endif endif
LOCAL_LDLIBS += -lOpenSLES -lz LOCAL_LDLIBS += -lOpenSLES -lz

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

@ -7,6 +7,7 @@ HAVE_NEON := 1
HAVE_LOGGER := 0 HAVE_LOGGER := 0
HAVE_VULKAN := 0 HAVE_VULKAN := 0
INCFLAGS :=
DEFINES := DEFINES :=
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -75,7 +76,10 @@ LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS
LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
ifeq ($(HAVE_VULKAN),1) ifeq ($(HAVE_VULKAN),1)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include
LOCAL_C_INCLUDES += $(INCFLAGS)
LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/Public
endif endif
LOCAL_LDLIBS += -lOpenSLES -lz LOCAL_LDLIBS += -lOpenSLES -lz