X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=e633337ffdf879e86ce00a105f37adc42daf183e;hb=175fe1b03060cd901dff1070e192cadb2685195f;hp=40ebb1cbcb922a5b7fe9af6048e8cbbd21635942;hpb=9fb3178968e3cf83b9c0835aa4b39805b2ba6cf8;p=pcsx_rearmed.git diff --git a/jni/Android.mk b/jni/Android.mk index 40ebb1cb..e633337f 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,10 +1,9 @@ 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)/.. @@ -12,22 +11,21 @@ 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 \ @@ -36,14 +34,14 @@ SOURCES_C := $(CORE_DIR)/cdriso.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 @@ -63,11 +61,6 @@ SOURCES_C += $(GPU_DIR)/gpu.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 \ @@ -75,26 +68,43 @@ SOURCES_C += $(FRONTEND_DIR)/main.c \ $(FRONTEND_DIR)/libretro.c # libchdr +LCHDR = $(DEPS_DIR)/libchdr +LCHDR_LZMA = $(LCHDR)/deps/lzma-22.01 +LCHDR_ZSTD = $(LCHDR)/deps/zstd-1.5.5/lib SOURCES_C += \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Alloc.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Bra86.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/BraIA64.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/CpuArch.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Delta.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/LzFind.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Lzma86Dec.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/LzmaDec.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/LzmaEnc.c \ - $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Sort.c \ - $(DEPS_DIR)/libchdr/src/libchdr_bitstream.c \ - $(DEPS_DIR)/libchdr/src/libchdr_cdrom.c \ - $(DEPS_DIR)/libchdr/src/libchdr_chd.c \ - $(DEPS_DIR)/libchdr/src/libchdr_flac.c \ - $(DEPS_DIR)/libchdr/src/libchdr_huffman.c + $(LCHDR)/src/libchdr_bitstream.c \ + $(LCHDR)/src/libchdr_cdrom.c \ + $(LCHDR)/src/libchdr_chd.c \ + $(LCHDR)/src/libchdr_flac.c \ + $(LCHDR)/src/libchdr_huffman.c \ + $(LCHDR_LZMA)/src/Alloc.c \ + $(LCHDR_LZMA)/src/Bra86.c \ + $(LCHDR_LZMA)/src/BraIA64.c \ + $(LCHDR_LZMA)/src/CpuArch.c \ + $(LCHDR_LZMA)/src/Delta.c \ + $(LCHDR_LZMA)/src/LzFind.c \ + $(LCHDR_LZMA)/src/Lzma86Dec.c \ + $(LCHDR_LZMA)/src/LzmaDec.c \ + $(LCHDR_LZMA)/src/LzmaEnc.c \ + $(LCHDR_LZMA)/src/Sort.c \ + $(LCHDR_ZSTD)/common/debug.c \ + $(LCHDR_ZSTD)/common/entropy_common.c \ + $(LCHDR_ZSTD)/common/error_private.c \ + $(LCHDR_ZSTD)/common/fse_decompress.c \ + $(LCHDR_ZSTD)/common/pool.c \ + $(LCHDR_ZSTD)/common/threading.c \ + $(LCHDR_ZSTD)/common/xxhash.c \ + $(LCHDR_ZSTD)/common/zstd_common.c \ + $(LCHDR_ZSTD)/decompress/huf_decompress.c \ + $(LCHDR_ZSTD)/decompress/zstd_ddict.c \ + $(LCHDR_ZSTD)/decompress/zstd_decompress_block.c \ + $(LCHDR_ZSTD)/decompress/zstd_decompress.c SOURCES_ASM := +EXTRA_INCLUDES += $(LCHDR)/include $(LCHDR_LZMA)/include $(LCHDR_ZSTD) +COREFLAGS += -DHAVE_CHD -D_7ZIP_ST -DZSTD_DISABLE_ASM -COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED -COREFLAGS += -DHAVE_CHD -D_7ZIP_ST +COREFLAGS += -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED +COREFLAGS += -DP_HAVE_MMAP=1 -DP_HAVE_PTHREAD=1 -DP_HAVE_POSIX_MEMALIGN=1 ifeq ($(USE_LIBRETRO_VFS),1) SOURCES_C += \ @@ -110,37 +120,55 @@ SOURCES_C += \ $(LIBRETRO_COMMON)/vfs/vfs_implementation.c COREFLAGS += -DUSE_LIBRETRO_VFS endif +EXTRA_INCLUDES += $(LIBRETRO_COMMON)/include 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 \ @@ -149,7 +177,8 @@ ifeq ($(HAVE_LIGHTREC),1) $(DEPS_DIR)/lightrec/optimizer.c \ $(DEPS_DIR)/lightrec/regcache.c \ $(DEPS_DIR)/lightrec/recompiler.c \ - $(DEPS_DIR)/lightrec/reaper.c + $(DEPS_DIR)/lightrec/reaper.c \ + $(DEPS_DIR)/lightrec/tlsf/tlsf.c SOURCES_C += $(DEPS_DIR)/lightning/lib/jit_disasm.c \ $(DEPS_DIR)/lightning/lib/jit_memory.c \ $(DEPS_DIR)/lightning/lib/jit_names.c \ @@ -157,25 +186,35 @@ ifeq ($(HAVE_LIGHTREC),1) $(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 \ + $(CORE_DIR)/lightrec/internals.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)" @@ -188,8 +227,7 @@ LOCAL_MODULE := retro LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM) LOCAL_CFLAGS := $(COREFLAGS) LOCAL_C_INCLUDES := $(ROOT_DIR)/include -LOCAL_C_INCLUDES += $(DEPS_DIR)/crypto $(DEPS_DIR)/libchdr/deps/lzma-19.00/include $(DEPS_DIR)/libchdr/include $(DEPS_DIR)/libchdr/include/libchdr -LOCAL_C_INCLUDES += $(LIBRETRO_COMMON)/include +LOCAL_C_INCLUDES += $(DEPS_DIR)/crypto LOCAL_C_INCLUDES += $(EXTRA_INCLUDES) LOCAL_LDFLAGS := -Wl,-version-script=$(FRONTEND_DIR)/link.T LOCAL_LDLIBS := -lz -llog