summaryrefslogtreecommitdiff
path: root/jni/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'jni/Android.mk')
-rw-r--r--jni/Android.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 4755db9..b3b81aa 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -3,15 +3,18 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := retro
+CPU_ARCH :=
ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -DANDROID_ARM
+LOCAL_CFLAGS += -DANDROID_ARM -DARM_ARCH
LOCAL_ARM_MODE := arm
+CPU_ARCH := arm
endif
-#ifeq ($(TARGET_ARCH),x86)
-#LOCAL_CFLAGS += -DANDROID_X86
-#endif
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CFLAGS += -DANDROID_X86
+CPU_ARCH := x86_32
+endif
#ifeq ($(TARGET_ARCH),mips)
#LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
@@ -22,11 +25,10 @@ CORE_DIR := ..
SOURCES_C :=
SOURCES_ASM :=
-CPU_ARCH := arm
include $(CORE_DIR)/Makefile.common
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)