From 77143179b59a86d59b72f3829d79258bd1c25bd1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 22 Mar 2016 16:40:02 +0100 Subject: [PATCH] Change back Android.mk file --- pkg/android/phoenix/jni/Android.mk | 162 ++++++++++------------------- 1 file changed, 57 insertions(+), 105 deletions(-) diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index 5c186b1366..acdc765492 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -1,4 +1,5 @@ LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) RARCH_DIR := ../../../.. @@ -9,37 +10,79 @@ HAVE_VULKAN := 1 INCFLAGS := DEFINES := +include $(CLEAR_VARS) ifeq ($(TARGET_ARCH),arm) DEFINES += -DANDROID_ARM -marm + LOCAL_ARM_MODE := arm endif ifeq ($(TARGET_ARCH),x86) DEFINES += -DANDROID_X86 -DHAVE_SSSE3 endif -DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC \ - -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES \ - -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB \ - -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI \ - -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS \ - -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY \ - -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN \ - -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_STB_FONT +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) + +ifeq ($(HAVE_NEON),1) + DEFINES += -D__ARM_NEON__ + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/audio_utils_neon.S.neon + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_resampler_neon.S.neon + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon +endif +DEFINES += -DSINC_LOWER_QUALITY +DEFINES += -DANDROID_ARM_V7 +endif + +ifeq ($(TARGET_ARCH),mips) + DEFINES += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ +endif + +LOCAL_MODULE := retroarch-activity + +LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin.c $(RARCH_DIR)/griffin/griffin_cpp.cpp + +ifeq ($(HAVE_LOGGER), 1) + DEFINES += -DHAVE_LOGGER +endif +LOGGER_LDLIBS := -llog + +ifeq ($(GLES),3) + GLES_LIB := -lGLESv3 + DEFINES += -DHAVE_OPENGLES3 +else + GLES_LIB := -lGLESv2 +endif + +DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_STB_FONT DEFINES += -DWANT_IFADDRS ifeq ($(HAVE_VULKAN),1) - DEFINES += -DHAVE_VULKAN +DEFINES += -DHAVE_VULKAN endif DEFINES += -DHAVE_7ZIP DEFINES += -DHAVE_CHEEVOS DEFINES += -DHAVE_SL -# glslang -include $(CLEAR_VARS) -LOCAL_MODULE := glslang -LOCAL_ARM_MODE := arm +LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES) +LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder $(DEFINES) -LOCAL_SRC_FILES := $(RARCH_DIR)/deps/glslang/glslang.cpp \ +# Let ndk-build set the optimization flags but remove -O3 like in cf3c3 +LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS)) + +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl +LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ + +ifeq ($(HAVE_VULKAN),1) +INCFLAGS += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include + +LOCAL_C_INCLUDES += $(INCFLAGS) +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 \ + -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/spir2cross + +LOCAL_SRC_FILES += $(RARCH_DIR)/deps/glslang/glslang.cpp \ + $(RARCH_DIR)/deps/glslang/glslang_tab.cpp \ $(RARCH_DIR)/deps/glslang/glslang/SPIRV/SpvBuilder.cpp \ $(RARCH_DIR)/deps/glslang/glslang/SPIRV/SPVRemapper.cpp \ $(RARCH_DIR)/deps/glslang/glslang/SPIRV/InReadableOrder.cpp \ @@ -50,7 +93,6 @@ LOCAL_SRC_FILES := $(RARCH_DIR)/deps/glslang/glslang.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp \ - $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/glslang_tab.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/Versions.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/limits.cpp \ @@ -75,95 +117,6 @@ LOCAL_SRC_FILES := $(RARCH_DIR)/deps/glslang/glslang.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpSymbols.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/OSDependent/Unix/ossource.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/Public \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/SPIRV \ - $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include - -# Permissive works around weird header issues in LLVM on x86. -LOCAL_CPPFLAGS := -std=gnu++11 -pthread -Wno-reorder -Wno-sign-compare -fpermissive $(DEFINES) -include $(BUILD_STATIC_LIBRARY) -##### - -# retroarch-activity (C++ side) -include $(CLEAR_VARS) -LOCAL_MODULE := retroarch-activity-cpp -LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin_cpp.cpp -LOCAL_ARM_MODE := arm -LOCAL_CPPFLAGS := -std=gnu++11 -pthread $(DEFINES) -LOCAL_CPP_FEATURES += exceptions - -ifeq ($(HAVE_VULKAN), 1) - LOCAL_STATIC_LIBRARIES := glslang -endif - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include - -ifeq ($(HAVE_VULKAN),1) - LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/Public \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang/glslang/SPIRV \ - $(LOCAL_PATH)/$(RARCH_DIR)/deps/spir2cross -endif - -ifneq ($(SANITIZER),) - LOCAL_CFLAGS += -g -fsanitize=$(SANITIZER) -fno-omit-frame-pointer - LOCAL_CPPFLAGS += -g -fsanitize=$(SANITIZER) -fno-omit-frame-pointer - LOCAL_LDFLAGS += -fsanitize=$(SANITIZER) -endif - -include $(BUILD_STATIC_LIBRARY) -####### - -# retroarch-activity -include $(CLEAR_VARS) -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -ifeq ($(HAVE_NEON),1) - DEFINES += -D__ARM_NEON__ - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/audio_utils_neon.S.neon - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_resampler_neon.S.neon - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon -endif -DEFINES += -DSINC_LOWER_QUALITY -DEFINES += -DANDROID_ARM_V7 -endif - -ifeq ($(TARGET_ARCH),mips) - DEFINES += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ -endif - -LOCAL_MODULE := retroarch-activity -LOCAL_STATIC_LIBRARIES := retroarch-activity-cpp -LOCAL_ARM_MODE := arm - -LOCAL_SRC_FILES += $(RARCH_DIR)/griffin/griffin.c - -ifeq ($(HAVE_LOGGER), 1) - DEFINES += -DHAVE_LOGGER -endif -LOGGER_LDLIBS := -llog - -ifeq ($(GLES),3) - GLES_LIB := -lGLESv3 - DEFINES += -DHAVE_OPENGLES3 -else - GLES_LIB := -lGLESv2 -endif - -LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES) - -# Let ndk-build set the optimization flags but remove -O3 like in cf3c3 -LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS)) - -LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl -LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include - -ifeq ($(HAVE_VULKAN),1) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include endif LOCAL_LDLIBS += -lOpenSLES -lz @@ -175,4 +128,3 @@ ifneq ($(SANITIZER),) endif include $(BUILD_SHARED_LIBRARY) -