lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45 from webgeek1234/master 

Fix up android jni makefiles
This commit is contained in:
Andrés 2018-03-31 17:42:03 -05:00 committed by GitHub
parent 638aad3ad5 4b0914b103
commit 63a21c71e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
jni/Android.mk
View File

@ -1,48 +1,44 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) CORE_CFLAGS :=
CORE_LDLIBS :=
CPU_ARCH :=
HAVE_DYNAREC :=
SOURCES_C :=
SOURCES_ASM :=
CORE_DIR := ..
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown") ifneq ($(GIT_VERSION)," unknown")
LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CORE_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif endif
LOCAL_MODULE := retro
CPU_ARCH :=
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DANDROID_ARM -DARM_ARCH -DARM_MEMORY_DYNAREC CORE_CFLAGS += -DARM_ARCH -DARM_MEMORY_DYNAREC
LOCAL_ARM_MODE := arm
CPU_ARCH := arm CPU_ARCH := arm
HAVE_DYNAREC := 1 HAVE_DYNAREC := 1
endif endif
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_MMAP CORE_CFLAGS += -DHAVE_MMAP
CPU_ARCH := x86_32 CPU_ARCH := x86_32
HAVE_DYNAREC := 1 HAVE_DYNAREC := 1
endif endif
#ifeq ($(TARGET_ARCH),mips)
#LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
#endif
CORE_DIR := ..
SOURCES_C :=
SOURCES_ASM :=
ifeq ($(HAVE_DYNAREC),1) ifeq ($(HAVE_DYNAREC),1)
LOCAL_CFLAGS += -DHAVE_DYNAREC CORE_CFLAGS += -DHAVE_DYNAREC
endif CORE_LDLIBS += -Wl,--no-warn-shared-textrel
ifeq ($(CPU_ARCH),arm)
LOCAL_CFLAGS += -DARM_ARCH
endif endif
include $(CORE_DIR)/Makefile.common include $(CORE_DIR)/Makefile.common
LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM) CORE_CFLAGS += -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS)
LOCAL_CFLAGS += -O2 -DNDEBUG -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS)
include $(CLEAR_VARS)
LOCAL_MODULE := retro
LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM)
LOCAL_CFLAGS := $(CORE_CFLAGS)
LOCAL_LDLIBS := $(CORE_LDLIBS)
LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

3
jni/Application.mk
View File

@ -1 +1,2 @@
APP_ABI := armeabi armeabi-v7a x86 NDK_TOOLCHAIN_VERSION := 4.9
APP_ABI := armeabi armeabi-v7a arm64-v8a x86