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

(Android) Add x86 target too

This commit is contained in:
twinaphex 2014-12-10 15:21:49 +01:00
parent f10da5d664
commit b3fe5aa3e4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jni/Android.mk
View File

@ -3,15 +3,18 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := retro LOCAL_MODULE := retro
CPU_ARCH :=
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DANDROID_ARM LOCAL_CFLAGS += -DANDROID_ARM -DARM_ARCH
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
CPU_ARCH := arm
endif endif
#ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
#LOCAL_CFLAGS += -DANDROID_X86 LOCAL_CFLAGS += -DANDROID_X86
#endif CPU_ARCH := x86_32
endif
#ifeq ($(TARGET_ARCH),mips) #ifeq ($(TARGET_ARCH),mips)
#LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ #LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
@ -22,11 +25,10 @@ CORE_DIR := ..
SOURCES_C := SOURCES_C :=
SOURCES_ASM := SOURCES_ASM :=
CPU_ARCH := arm
include $(CORE_DIR)/Makefile.common include $(CORE_DIR)/Makefile.common
LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM) LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM)
LOCAL_CFLAGS += -O2 -DHAVE_MMAP -DARM_ARCH -DNDEBUG -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS) LOCAL_CFLAGS += -O2 -DHAVE_MMAP -DNDEBUG -DPC_BUILD -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
jni/Application.mk
View File

@ -1 +1 @@
APP_ABI := armeabi armeabi-v7a APP_ABI := armeabi armeabi-v7a x86