diff options
| author | Aaron Kling | 2018-04-06 16:13:44 -0500 |
|---|---|---|
| committer | Aaron Kling | 2018-04-06 16:13:44 -0500 |
| commit | 9dcd9144cd8e02040462ebea16a129cb254d589d (patch) | |
| tree | c642b8c423020d5ca640d871a9d79f901757a9ce /jni/Android.mk | |
| parent | a9d1206901a39204bd7bf609f40f574358ac5cad (diff) | |
| download | picogpsp-9dcd9144cd8e02040462ebea16a129cb254d589d.tar.gz picogpsp-9dcd9144cd8e02040462ebea16a129cb254d589d.tar.bz2 picogpsp-9dcd9144cd8e02040462ebea16a129cb254d589d.zip | |
Refactor android jni makefiles
Diffstat (limited to 'jni/Android.mk')
| -rw-r--r-- | jni/Android.mk | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 3fec1dc..dc86e69 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,44 +1,39 @@ LOCAL_PATH := $(call my-dir) -CORE_CFLAGS := +CORE_DIR := $(LOCAL_PATH)/.. + CORE_LDLIBS := CPU_ARCH := HAVE_DYNAREC := -SOURCES_C := -SOURCES_ASM := - -CORE_DIR := .. -GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" -ifneq ($(GIT_VERSION)," unknown") - CORE_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" -endif +COREFLAGS := -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 ifeq ($(TARGET_ARCH),arm) - CORE_CFLAGS += -DARM_ARCH -DARM_MEMORY_DYNAREC + COREFLAGS += -DARM_ARCH -DARM_MEMORY_DYNAREC CPU_ARCH := arm HAVE_DYNAREC := 1 -endif - -ifeq ($(TARGET_ARCH),x86) - CORE_CFLAGS += -DHAVE_MMAP +else ifeq ($(TARGET_ARCH),x86) + COREFLAGS += -DHAVE_MMAP CPU_ARCH := x86_32 HAVE_DYNAREC := 1 endif ifeq ($(HAVE_DYNAREC),1) - CORE_CFLAGS += -DHAVE_DYNAREC + COREFLAGS += -DHAVE_DYNAREC CORE_LDLIBS += -Wl,--no-warn-shared-textrel endif include $(CORE_DIR)/Makefile.common -CORE_CFLAGS += -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS) +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +endif include $(CLEAR_VARS) LOCAL_MODULE := retro LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM) -LOCAL_CFLAGS := $(CORE_CFLAGS) +LOCAL_CFLAGS := $(COREFLAGS) $(INCFLAGS) +LOCAL_LDFLAGS := -Wl,-version-script=$(CORE_DIR)/link.T LOCAL_LDLIBS := $(CORE_LDLIBS) -LOCAL_ARM_MODE := arm include $(BUILD_SHARED_LIBRARY) |