notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Android) Only build in libpcsxcore/lightrec/mem.c when
[pcsx_rearmed.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
50aa696
..
a64525e
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-1,6
+1,6
@@
LOCAL_PATH := $(call my-dir)
LOCAL_PATH := $(call my-dir)
-$(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_))
+$(shell cd "$(LOCAL_PATH)" && ((git describe
--always
|| echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_))
$(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h))
$(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_))
$(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h))
$(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_))
@@
-111,6
+111,7
@@
endif
HAVE_ARI64=0
HAVE_LIGHTREC=0
HAVE_ARI64=0
HAVE_LIGHTREC=0
+LIGHTREC_CUSTOM_MAP=0
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
HAVE_ARI64=1
else ifeq ($(TARGET_ARCH_ABI),armeabi)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
HAVE_ARI64=1
else ifeq ($(TARGET_ARCH_ABI),armeabi)
@@
-124,6
+125,7
@@
else ifeq ($(TARGET_ARCH_ABI),x86)
else
COREFLAGS += -DDRC_DISABLE
endif
else
COREFLAGS += -DDRC_DISABLE
endif
+ COREFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
ifeq ($(HAVE_ARI64),1)
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
ifeq ($(HAVE_ARI64),1)
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
@@
-141,7
+143,9
@@
endif
ifeq ($(HAVE_LIGHTREC),1)
COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC
EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \
ifeq ($(HAVE_LIGHTREC),1)
COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC
EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \
- $(DEPS_DIR)/lightrec
+ $(DEPS_DIR)/lightrec \
+ $(ROOT_DIR)/include/lightning \
+ $(ROOT_DIR)/include/lightrec
SOURCES_C += $(DEPS_DIR)/lightrec/blockcache.c \
$(DEPS_DIR)/lightrec/disassembler.c \
$(DEPS_DIR)/lightrec/emitter.c \
SOURCES_C += $(DEPS_DIR)/lightrec/blockcache.c \
$(DEPS_DIR)/lightrec/disassembler.c \
$(DEPS_DIR)/lightrec/emitter.c \
@@
-160,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
$(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
endif