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_))
SOURCES_C := $(CORE_DIR)/cdriso.c \
$(CORE_DIR)/cdrom.c \
$(CORE_DIR)/cheat.c \
+ $(CORE_DIR)/database.c \
$(CORE_DIR)/decode_xa.c \
$(CORE_DIR)/mdec.c \
$(CORE_DIR)/misc.c \
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)
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
COREFLAGS += -DDRC_DISABLE
endif
+ COREFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
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 \
- $(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
+ SOURCES_C += $(DYNAREC_DIR)/emu_if.c
ifeq ($(HAVE_LIGHTREC),1)
COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC
EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \
- $(DEPS_DIR)/lightrec
+ $(DEPS_DIR)/lightrec \
+ $(DEPS_DIR)/lightrec/tlsf \
+ $(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 \
$(DEPS_DIR)/lightning/lib/jit_print.c \
$(DEPS_DIR)/lightning/lib/jit_size.c \
$(DEPS_DIR)/lightning/lib/lightning.c
- SOURCES_C += $(CORE_DIR)/lightrec/plugin.c
+ SOURCES_C += $(CORE_DIR)/lightrec/plugin.c $(DEPS_DIR)/lightrec/tlsf/tlsf.c
+ifeq ($(LIGHTREC_CUSTOM_MAP),1)
+ SOURCES_C += $(CORE_DIR)/lightrec/mem.c
+endif
endif
$(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 \