ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Android Makefiles

This commit is contained in:
twinaphex 2018-09-29 20:45:08 +02:00
parent fb2846f0a2
commit a44c9bf011
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ RARCH_DIR := ../../../..
HAVE_NEON := 1 HAVE_NEON := 1
HAVE_LOGGER := 0 HAVE_LOGGER := 0
HAVE_VULKAN := 1 HAVE_VULKAN := 1
HAVE_CHEEVOS := 1
INCFLAGS := INCFLAGS :=
DEFINES := DEFINES :=
@ -78,9 +79,12 @@ ifeq ($(HAVE_VULKAN),1)
DEFINES += -DHAVE_VULKAN -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -D__STDC_LIMIT_MACROS DEFINES += -DHAVE_VULKAN -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -D__STDC_LIMIT_MACROS
endif endif
DEFINES += -DHAVE_7ZIP DEFINES += -DHAVE_7ZIP
DEFINES += -DHAVE_CHEEVOS
DEFINES += -DHAVE_SL DEFINES += -DHAVE_SL
#DEFINES += -DHAVE_TINYALSA
ifeq ($(HAVE_CHEEVOS),1)
DEFINES += -DHAVE_CHEEVOS
endif
DEFINES += -DFLAC_PACKAGE_VERSION="\"retroarch\"" -DHAVE_LROUND -DFLAC__HAS_OGG=0 DEFINES += -DFLAC_PACKAGE_VERSION="\"retroarch\"" -DHAVE_LROUND -DFLAC__HAS_OGG=0
LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES) LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES)
@ -99,10 +103,14 @@ LOCAL_C_INCLUDES := \
INCLUDE_DIRS := \ INCLUDE_DIRS := \
-I$(LOCAL_PATH)/$(DEPS_DIR)/stb/ \ -I$(LOCAL_PATH)/$(DEPS_DIR)/stb/ \
-I$(LOCAL_PATH)/$(DEPS_DIR)/7zip/ \ -I$(LOCAL_PATH)/$(DEPS_DIR)/7zip/ \
-I$(LOCAL_PATH)/$(DEPS_DIR)/rcheevos/include \
-I$(LOCAL_PATH)/$(DEPS_DIR)/libFLAC/include -I$(LOCAL_PATH)/$(DEPS_DIR)/libFLAC/include
ifeq ($(HAVE_CHEEVOS),1)
INCLUDE_DIRS += -I$(LOCAL_PATH)/$(DEPS_DIR)/rcheevos/include
endif
LOCAL_CFLAGS += $(INCLUDE_DIRS) LOCAL_CFLAGS += $(INCLUDE_DIRS)
LOCAL_CPPFLAGS += $(INCLUDE_DIRS)
LOCAL_CXXFLAGS += $(INCLUDE_DIRS) LOCAL_CXXFLAGS += $(INCLUDE_DIRS)
ifeq ($(HAVE_VULKAN),1) ifeq ($(HAVE_VULKAN),1)

18
pkg/android/phoenix64/jni/Android.mk
View File

@ -4,9 +4,10 @@ include $(CLEAR_VARS)
RARCH_DIR := ../../../.. RARCH_DIR := ../../../..
HAVE_NEON := 1 HAVE_NEON := 1
HAVE_LOGGER := 0 HAVE_LOGGER := 0
HAVE_VULKAN := 1 HAVE_VULKAN := 1
HAVE_CHEEVOS := 1
INCFLAGS := INCFLAGS :=
DEFINES := DEFINES :=
@ -78,9 +79,12 @@ ifeq ($(HAVE_VULKAN),1)
DEFINES += -DHAVE_VULKAN -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -D__STDC_LIMIT_MACROS DEFINES += -DHAVE_VULKAN -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -D__STDC_LIMIT_MACROS
endif endif
DEFINES += -DHAVE_7ZIP DEFINES += -DHAVE_7ZIP
ifeq ($(HAVE_CHEEVOS),1)
DEFINES += -DHAVE_CHEEVOS DEFINES += -DHAVE_CHEEVOS
endif
DEFINES += -DHAVE_SL DEFINES += -DHAVE_SL
#DEFINES += -DHAVE_TINYALSA
DEFINES += -DFLAC_PACKAGE_VERSION="\"retroarch\"" -DHAVE_LROUND -DFLAC__HAS_OGG=0 DEFINES += -DFLAC_PACKAGE_VERSION="\"retroarch\"" -DHAVE_LROUND -DFLAC__HAS_OGG=0
LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES) LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES)
@ -99,11 +103,15 @@ LOCAL_C_INCLUDES := \
INCLUDE_DIRS := \ INCLUDE_DIRS := \
-I$(LOCAL_PATH)/$(DEPS_DIR)/stb/ \ -I$(LOCAL_PATH)/$(DEPS_DIR)/stb/ \
-I$(LOCAL_PATH)/$(DEPS_DIR)/7zip/ \ -I$(LOCAL_PATH)/$(DEPS_DIR)/7zip/ \
-I$(LOCAL_PATH)/$(DEPS_DIR)/rcheevos/include \
-I$(LOCAL_PATH)/$(DEPS_DIR)/libFLAC/include -I$(LOCAL_PATH)/$(DEPS_DIR)/libFLAC/include
ifeq ($(HAVE_CHEEVOS),1)
INCLUDE_DIRS += -I$(LOCAL_PATH)/$(DEPS_DIR)/rcheevos/include
endif
LOCAL_CFLAGS += $(INCLUDE_DIRS) LOCAL_CFLAGS += $(INCLUDE_DIRS)
LOCAL_CXXFLAGS += $(INCLUDE_DIRS) LOCAL_CXXFLAGS += $(INCLUDE_DIRS)
LOCAL_CPPFLAGS == $(INCLUDE_DIRS)
ifeq ($(HAVE_VULKAN),1) ifeq ($(HAVE_VULKAN),1)
INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include