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
drc: rework jump_out lists
[pcsx_rearmed.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
40ebb1c
..
ce9762a
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_))
@@
-25,9
+25,8
@@
EXTRA_INCLUDES :=
SOURCES_C := $(CORE_DIR)/cdriso.c \
$(CORE_DIR)/cdrom.c \
$(CORE_DIR)/cheat.c \
SOURCES_C := $(CORE_DIR)/cdriso.c \
$(CORE_DIR)/cdrom.c \
$(CORE_DIR)/cheat.c \
- $(CORE_DIR)/d
ebug
.c \
+ $(CORE_DIR)/d
atabase
.c \
$(CORE_DIR)/decode_xa.c \
$(CORE_DIR)/decode_xa.c \
- $(CORE_DIR)/disr3000a.c \
$(CORE_DIR)/mdec.c \
$(CORE_DIR)/misc.c \
$(CORE_DIR)/plugins.c \
$(CORE_DIR)/mdec.c \
$(CORE_DIR)/misc.c \
$(CORE_DIR)/plugins.c \
@@
-42,7
+41,6
@@
SOURCES_C := $(CORE_DIR)/cdriso.c \
$(CORE_DIR)/psxmem.c \
$(CORE_DIR)/r3000a.c \
$(CORE_DIR)/sio.c \
$(CORE_DIR)/psxmem.c \
$(CORE_DIR)/r3000a.c \
$(CORE_DIR)/sio.c \
- $(CORE_DIR)/socket.c \
$(CORE_DIR)/spu.c \
$(CORE_DIR)/gte.c \
$(CORE_DIR)/gte_nf.c \
$(CORE_DIR)/spu.c \
$(CORE_DIR)/gte.c \
$(CORE_DIR)/gte_nf.c \
@@
-118,7
+116,7
@@
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
else ifeq ($(TARGET_ARCH_ABI),armeabi)
HAVE_ARI64=1
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
else ifeq ($(TARGET_ARCH_ABI),armeabi)
HAVE_ARI64=1
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
- HAVE_
LIGHTREC
=1
+ HAVE_
ARI64
=1
else ifeq ($(TARGET_ARCH_ABI),x86_64)
HAVE_LIGHTREC=1
else ifeq ($(TARGET_ARCH_ABI),x86)
else ifeq ($(TARGET_ARCH_ABI),x86_64)
HAVE_LIGHTREC=1
else ifeq ($(TARGET_ARCH_ABI),x86)
@@
-128,18
+126,24
@@
else
endif
ifeq ($(HAVE_ARI64),1)
endif
ifeq ($(HAVE_ARI64),1)
- COREFLAGS += -DNEW_DYNAREC
- SOURCES_ASM += $(CORE_DIR)/gte_arm.S \
- $(SPU_DIR)/arm_utils.S \
- $(DYNAREC_DIR)/arm/linkage_arm.S
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
- $(DYNAREC_DIR)/backends/psx/pcsxmem.c
+ $(DYNAREC_DIR)/pcsxmem.c
+ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+ SOURCES_ASM += $(DYNAREC_DIR)/linkage_arm64.S
+ else
+ SOURCES_ASM += $(CORE_DIR)/gte_arm.S \
+ $(SPU_DIR)/arm_utils.S \
+ $(DYNAREC_DIR)/linkage_arm.S
+ endif
endif
endif
+ SOURCES_C += $(DYNAREC_DIR)/emu_if.c
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 \
@@
-167,7
+171,6
@@
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
$(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
$(FRONTEND_DIR)/cspace_neon.S
SOURCES_C += $(NEON_DIR)/psx_gpu_if.c
$(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
$(FRONTEND_DIR)/cspace_neon.S
SOURCES_C += $(NEON_DIR)/psx_gpu_if.c
- SOURCES_C += $(DYNAREC_DIR)/backends/psx/emu_if.c
else ifeq ($(TARGET_ARCH_ABI),armeabi)
COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
else ifeq ($(TARGET_ARCH_ABI),armeabi)
COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \