Merge pull request #661 from pcercuei/update-lightrec-20220604

[pcsx_rearmed.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 519880c..a64525e 100644 (file)
--- 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