diff options
| author | Twinaphex | 2018-04-11 20:36:39 +0200 |
|---|---|---|
| committer | GitHub | 2018-04-11 20:36:39 +0200 |
| commit | eaa86f2374756baef07f21170c516d51fec9f3da (patch) | |
| tree | 90cfa2c9d863438f1860e64d58454330df69613c /jni | |
| parent | 0eae4561fdc190192dc31f751382b3f47fd6755f (diff) | |
| parent | d082d9c34a0906ac0dbb6675dd499274a7dba4d2 (diff) | |
| download | snes9x2002-eaa86f2374756baef07f21170c516d51fec9f3da.tar.gz snes9x2002-eaa86f2374756baef07f21170c516d51fec9f3da.tar.bz2 snes9x2002-eaa86f2374756baef07f21170c516d51fec9f3da.zip | |
Merge pull request #24 from webgeek1234/master
Refactor android jni makefiles
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 324a646..bb8d209 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,32 +1,25 @@ LOCAL_PATH := $(call my-dir) -ARM_ASM = 0 -SOURCES := -DEFINES := -COMMON_DEFINES := - -include $(CLEAR_VARS) +ROOT_DIR := $(LOCAL_PATH)/.. +CORE_DIR := $(ROOT_DIR)/src +LIBRETRO_DIR := $(ROOT_DIR)/libretro -LOCAL_MODULE := retro +ARM_ASM := 0 +DEFINES := +COMMON_DEFINES := ifeq ($(TARGET_ARCH),arm) -ARM_ASM = 1 -ASM_CPU = 0 -ASM_SPC700 = 0 -LOCAL_ARM_MODE := arm + ARM_ASM := 1 endif -ifeq ($(NDK_DEBUG),1) -DEBUG = 1 -endif - -CORE_DIR := ../src -LIBRETRO_DIR := ../libretro +include $(ROOT_DIR)/Makefile.common -include ../Makefile.common +COREFLAGS := $(DEFINES) $(COMMON_DEFINES) $(INCLUDES) +include $(CLEAR_VARS) +LOCAL_MODULE := retro LOCAL_SRC_FILES := $(SOURCES) -LOCAL_CFLAGS += $(DEFINES) $(COMMON_DEFINES) $(INCLUDES) -std=c99 -LOCAL_ASFLAGS += $(DEFINES) $(COMMON_DEFINES) $(INCLUDES) - +LOCAL_CFLAGS := -std=c99 $(COREFLAGS) +LOCAL_LDFLAGS := -Wl,-version-script=$(LIBRETRO_DIR)/link.T +LOCAL_ARM_MODE := arm include $(BUILD_SHARED_LIBRARY) |