Merge pull request #498 from glebm/patch-1

[pcsx_rearmed.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 819d7fb..eabe464 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -158,7 +158,8 @@ ifeq ($(HAVE_LIGHTREC),1)
                                          $(DEPS_DIR)/lightrec/memmanager.c \
                                          $(DEPS_DIR)/lightrec/optimizer.c \
                                          $(DEPS_DIR)/lightrec/regcache.c \
-                                         $(DEPS_DIR)/lightrec/recompiler.c
+                                         $(DEPS_DIR)/lightrec/recompiler.c \
+                                         $(DEPS_DIR)/lightrec/reaper.c
   SOURCES_C   += $(DEPS_DIR)/lightning/lib/jit_disasm.c \
                                          $(DEPS_DIR)/lightning/lib/jit_memory.c \
                                          $(DEPS_DIR)/lightning/lib/jit_names.c \
@@ -179,13 +180,11 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   SOURCES_C   += $(DYNAREC_DIR)/backends/psx/emu_if.c
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
   COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
-  COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__"
   SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
                  $(FRONTEND_DIR)/cspace_arm.S
   SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
 else
   COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
-  COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__"
   SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
 endif
 
@@ -209,8 +208,5 @@ LOCAL_ARM_MODE      := arm
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   LOCAL_ARM_NEON  := true
 endif
-ifeq ($(TARGET_ARCH),arm)
-  LOCAL_LDLIBS    += -Wl,-no-warn-shared-textrel
-endif
 
 include $(BUILD_SHARED_LIBRARY)