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_))
HAVE_CHD ?= 1
+USE_LIBRETRO_VFS ?= 0
ROOT_DIR := $(LOCAL_PATH)/..
CORE_DIR := $(ROOT_DIR)/libpcsxcore
SPU_DIR := $(ROOT_DIR)/plugins/dfsound
GPU_DIR := $(ROOT_DIR)/plugins/gpulib
CDR_DIR := $(ROOT_DIR)/plugins/cdrcimg
-INPUT_DIR := $(ROOT_DIR)/plugins/dfinput
FRONTEND_DIR := $(ROOT_DIR)/frontend
NEON_DIR := $(ROOT_DIR)/plugins/gpu_neon
UNAI_DIR := $(ROOT_DIR)/plugins/gpu_unai
+PEOPS_DIR := $(ROOT_DIR)/plugins/dfxvideo
DYNAREC_DIR := $(ROOT_DIR)/libpcsxcore/new_dynarec
DEPS_DIR := $(ROOT_DIR)/deps
-LIBRETRO_COMMON := $(ROOT_DIR)/libretro-common
+LIBRETRO_COMMON := $(DEPS_DIR)/libretro-common
EXTRA_INCLUDES :=
# core
SOURCES_C := $(CORE_DIR)/cdriso.c \
$(CORE_DIR)/cdrom.c \
$(CORE_DIR)/cheat.c \
- $(CORE_DIR)/debug.c \
+ $(CORE_DIR)/database.c \
$(CORE_DIR)/decode_xa.c \
- $(CORE_DIR)/disr3000a.c \
$(CORE_DIR)/mdec.c \
$(CORE_DIR)/misc.c \
$(CORE_DIR)/plugins.c \
$(CORE_DIR)/psxcommon.c \
$(CORE_DIR)/psxcounters.c \
$(CORE_DIR)/psxdma.c \
- $(CORE_DIR)/psxhle.c \
+ $(CORE_DIR)/psxevents.c \
$(CORE_DIR)/psxhw.c \
$(CORE_DIR)/psxinterpreter.c \
$(CORE_DIR)/psxmem.c \
$(CORE_DIR)/r3000a.c \
$(CORE_DIR)/sio.c \
- $(CORE_DIR)/socket.c \
$(CORE_DIR)/spu.c \
+ $(CORE_DIR)/gpu.c \
$(CORE_DIR)/gte.c \
$(CORE_DIR)/gte_nf.c \
$(CORE_DIR)/gte_divider.c
# cdrcimg
SOURCES_C += $(CDR_DIR)/cdrcimg.c
-# dfinput
-SOURCES_C += $(INPUT_DIR)/main.c \
- $(INPUT_DIR)/pad.c \
- $(INPUT_DIR)/guncon.c
-
# frontend
SOURCES_C += $(FRONTEND_DIR)/main.c \
$(FRONTEND_DIR)/plugin.c \
SOURCES_ASM :=
COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED
-COREFLAGS += -DHAVE_CHD -D_7ZIP_ST
+COREFLAGS += -DP_HAVE_MMAP=1 -DP_HAVE_PTHREAD=1 -DP_HAVE_POSIX_MEMALIGN=1 -DHAVE_CHD -D_7ZIP_ST
+
+ifeq ($(USE_LIBRETRO_VFS),1)
+SOURCES_C += \
+ $(LIBRETRO_COMMON)/compat/compat_posix_string.c \
+ $(LIBRETRO_COMMON)/compat/fopen_utf8.c \
+ $(LIBRETRO_COMMON)/encodings/compat_strl.c \
+ $(LIBRETRO_COMMON)/encodings/encoding_utf.c \
+ $(LIBRETRO_COMMON)/file/file_path.c \
+ $(LIBRETRO_COMMON)/streams/file_stream.c \
+ $(LIBRETRO_COMMON)/streams/file_stream_transforms.c \
+ $(LIBRETRO_COMMON)/string/stdstring.c \
+ $(LIBRETRO_COMMON)/time/rtime.c \
+ $(LIBRETRO_COMMON)/vfs/vfs_implementation.c
+COREFLAGS += -DUSE_LIBRETRO_VFS
+endif
HAVE_ARI64=0
HAVE_LIGHTREC=0
+LIGHTREC_CUSTOM_MAP=0
+LIGHTREC_THREADED_COMPILER=0
+HAVE_GPU_NEON=0
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
HAVE_ARI64=1
+ HAVE_GPU_NEON=1
else ifeq ($(TARGET_ARCH_ABI),armeabi)
HAVE_ARI64=1
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
- HAVE_LIGHTREC=1
+ HAVE_ARI64=1
+ HAVE_GPU_NEON=1
else ifeq ($(TARGET_ARCH_ABI),x86_64)
HAVE_LIGHTREC=1
+ HAVE_GPU_NEON=1
else ifeq ($(TARGET_ARCH_ABI),x86)
HAVE_LIGHTREC=1
+ HAVE_GPU_NEON=1
else
COREFLAGS += -DDRC_DISABLE
endif
+ COREFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
+ COREFLAGS += -DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER)
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/constprop.c \
$(DEPS_DIR)/lightrec/disassembler.c \
$(DEPS_DIR)/lightrec/emitter.c \
$(DEPS_DIR)/lightrec/interpreter.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
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ifeq ($(HAVE_GPU_NEON),1)
COREFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -DGPU_NEON
- SOURCES_ASM += $(CORE_DIR)/gte_neon.S \
- $(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
- $(FRONTEND_DIR)/cspace_neon.S
+ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ COREFLAGS += -DHAVE_bgr555_to_rgb565 -DHAVE_bgr888_to_x
+ SOURCES_ASM += $(CORE_DIR)/gte_neon.S \
+ $(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
+ $(FRONTEND_DIR)/cspace_neon.S
+ else
+ COREFLAGS += -DSIMD_BUILD
+ SOURCES_C += $(NEON_DIR)/psx_gpu/psx_gpu_simd.c
+ endif
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
+ COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
+ COREFLAGS += -DHAVE_bgr555_to_rgb565
SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
$(FRONTEND_DIR)/cspace_arm.S
SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
else
- COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
- SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
+ COREFLAGS += -fno-strict-aliasing -DGPU_PEOPS
+ SOURCES_C += $(PEOPS_DIR)/gpulib_if.c
endif
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
notaz.gp2x.de / pcsx_rearmed.git / blobdiff