X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=a64525efcbae79468d153810c80fe833fb81b1e3;hb=473f5cc63f9942866e01c7c84d151e8157cdb6ee;hp=519880c7c2eb36f1842764fc2275e6bd4ab4daaa;hpb=21597f53bda179a9f90d04e46f87b5a95994c882;p=pcsx_rearmed.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 519880c7..a64525ef 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -120,13 +120,12 @@ else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
   HAVE_ARI64=1
 else ifeq ($(TARGET_ARCH_ABI),x86_64)
   HAVE_LIGHTREC=1
-  LIGHTREC_CUSTOM_MAP=1
 else ifeq ($(TARGET_ARCH_ABI),x86)
   HAVE_LIGHTREC=1
-  LIGHTREC_CUSTOM_MAP=1
 else
   COREFLAGS   += -DDRC_DISABLE
 endif
+  COREFLAGS   += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
 
 ifeq ($(HAVE_ARI64),1)
   SOURCES_C   += $(DYNAREC_DIR)/new_dynarec.c \
@@ -142,7 +141,7 @@ endif
   SOURCES_C   += $(DYNAREC_DIR)/emu_if.c
 
 ifeq ($(HAVE_LIGHTREC),1)
-  COREFLAGS   += -DLIGHTREC -DLIGHTREC_STATIC -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
+  COREFLAGS   += -DLIGHTREC -DLIGHTREC_STATIC
   EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \
 		    $(DEPS_DIR)/lightrec \
 		    $(ROOT_DIR)/include/lightning \
@@ -165,6 +164,9 @@ ifeq ($(HAVE_LIGHTREC),1)
 					  $(DEPS_DIR)/lightning/lib/jit_size.c \
 					  $(DEPS_DIR)/lightning/lib/lightning.c
   SOURCES_C   += $(CORE_DIR)/lightrec/plugin.c
+ifeq ($(LIGHTREC_CUSTOM_MAP),1)
+  SOURCES_C   += $(CORE_DIR)/lightrec/mem.c
+endif
 endif