X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=jni%2FAndroid.mk;fp=jni%2FAndroid.mk;h=501b0671aa63505473f5edc56934db43902f6767;hp=da000f3ea8767231e7c92acdcca26425118231c9;hb=7a8d521fba9c86ae7b51369ce061bf63112b745f;hpb=acc415b3040edfcc91226955f39b405f09cca430 diff --git a/jni/Android.mk b/jni/Android.mk index da000f3e..501b0671 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -4,96 +4,221 @@ $(shell cd "$(LOCAL_PATH)" && ((git describe --always || echo) | sed -e 's/.*/#d $(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_)) -include $(CLEAR_VARS) - -APP_DIR := ../../src - -ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) - NO_NEON_BUILD := 1 -else - NO_NEON_BUILD := $(NO_NEON) -endif - -ifeq ($(NO_NEON_BUILD)$(TARGET_ARCH_ABI),1armeabi-v7a) - LOCAL_MODULE := retro-noneon -else - LOCAL_MODULE := retro -endif +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 +EXTRA_INCLUDES := + +# core +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 \ + $(CORE_DIR)/plugins.c \ + $(CORE_DIR)/ppf.c \ + $(CORE_DIR)/psxbios.c \ + $(CORE_DIR)/psxcommon.c \ + $(CORE_DIR)/psxcounters.c \ + $(CORE_DIR)/psxdma.c \ + $(CORE_DIR)/psxhle.c \ + $(CORE_DIR)/psxhw.c \ + $(CORE_DIR)/psxinterpreter.c \ + $(CORE_DIR)/psxmem.c \ + $(CORE_DIR)/r3000a.c \ + $(CORE_DIR)/sio.c \ + $(CORE_DIR)/spu.c \ + $(CORE_DIR)/gte.c \ + $(CORE_DIR)/gte_nf.c \ + $(CORE_DIR)/gte_divider.c -ifeq ($(TARGET_ARCH),arm) - LOCAL_ARM_MODE := arm - - LOCAL_CFLAGS += -DANDROID_ARM - - LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.S - - # dynarec - LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/linkage_arm.S ../libpcsxcore/new_dynarec/emu_if.c ../libpcsxcore/new_dynarec/pcsxmem.c - - # spu - LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S +# spu +SOURCES_C += $(SPU_DIR)/dma.c \ + $(SPU_DIR)/freeze.c \ + $(SPU_DIR)/registers.c \ + $(SPU_DIR)/spu.c \ + $(SPU_DIR)/out.c \ + $(SPU_DIR)/nullsnd.c - # misc +# gpu +SOURCES_C += $(GPU_DIR)/gpu.c \ + $(GPU_DIR)/vout_pl.c - ifeq ($(NO_NEON_BUILD),1) - # gpu - LOCAL_CFLAGS += -DREARMED - LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s - LOCAL_SRC_FILES += ../frontend/cspace_arm.S - else - LOCAL_ARM_NEON := true - LOCAL_CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP - LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../frontend/cspace_neon.S +# cdrcimg +SOURCES_C += $(CDR_DIR)/cdrcimg.c - # gpu - LOCAL_SRC_FILES += ../plugins/gpu_neon/psx_gpu_if.c ../plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S - endif +# 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 \ + $(FRONTEND_DIR)/cspace.c \ + $(FRONTEND_DIR)/libretro.c + +# libchdr +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 +SOURCES_ASM := + +COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED +COREFLAGS += -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 -ifeq ($(TARGET_ARCH),x86) - LOCAL_CFLAGS += -DANDROID_X86 +HAVE_ARI64=0 +HAVE_LIGHTREC=0 +LIGHTREC_CUSTOM_MAP=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_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 - -ifeq ($(TARGET_ARCH),mips) - LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ + COREFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP) + +ifeq ($(HAVE_ARI64),1) + SOURCES_C += $(DYNAREC_DIR)/new_dynarec.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/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)/lightrec/interpreter.c \ + $(DEPS_DIR)/lightrec/lightrec.c \ + $(DEPS_DIR)/lightrec/memmanager.c \ + $(DEPS_DIR)/lightrec/optimizer.c \ + $(DEPS_DIR)/lightrec/regcache.c \ + $(DEPS_DIR)/lightrec/recompiler.c \ + $(DEPS_DIR)/lightrec/reaper.c + SOURCES_C += $(DEPS_DIR)/lightning/lib/jit_disasm.c \ + $(DEPS_DIR)/lightning/lib/jit_memory.c \ + $(DEPS_DIR)/lightning/lib/jit_names.c \ + $(DEPS_DIR)/lightning/lib/jit_note.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 $(DEPS_DIR)/lightrec/tlsf/tlsf.c +ifeq ($(LIGHTREC_CUSTOM_MAP),1) + SOURCES_C += $(CORE_DIR)/lightrec/mem.c endif - -ifneq ($(TARGET_ARCH),arm) - # gpu - LOCAL_CFLAGS += -DREARMED - LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp endif -LOCAL_SRC_FILES += ../libpcsxcore/cdriso.c ../libpcsxcore/cdrom.c ../libpcsxcore/cheat.c ../libpcsxcore/debug.c \ - ../libpcsxcore/decode_xa.c ../libpcsxcore/disr3000a.c ../libpcsxcore/mdec.c \ - ../libpcsxcore/misc.c ../libpcsxcore/plugins.c ../libpcsxcore/ppf.c ../libpcsxcore/psxbios.c \ - ../libpcsxcore/psxcommon.c ../libpcsxcore/psxcounters.c ../libpcsxcore/psxdma.c ../libpcsxcore/psxhle.c \ - ../libpcsxcore/psxhw.c ../libpcsxcore/psxinterpreter.c ../libpcsxcore/psxmem.c ../libpcsxcore/r3000a.c \ - ../libpcsxcore/sio.c ../libpcsxcore/socket.c ../libpcsxcore/spu.c -LOCAL_SRC_FILES += ../libpcsxcore/gte.c ../libpcsxcore/gte_nf.c ../libpcsxcore/gte_divider.c - -# spu -LOCAL_SRC_FILES += ../plugins/dfsound/dma.c ../plugins/dfsound/freeze.c \ - ../plugins/dfsound/registers.c ../plugins/dfsound/spu.c \ - ../plugins/dfsound/out.c ../plugins/dfsound/nullsnd.c - -# builtin gpu -LOCAL_SRC_FILES += ../plugins/gpulib/gpu.c ../plugins/gpulib/vout_pl.c - -# cdrcimg -LOCAL_SRC_FILES += ../plugins/cdrcimg/cdrcimg.c - -# dfinput -LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c -# misc -LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c ../frontend/cspace.c +ifeq ($(HAVE_GPU_NEON),1) + COREFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -DGPU_NEON + 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 +else ifeq ($(TARGET_ARCH_ABI),armeabi) + 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 += -fno-strict-aliasing -DGPU_PEOPS + SOURCES_C += $(PEOPS_DIR)/gpulib_if.c +endif -# libretro -LOCAL_SRC_FILES += ../frontend/libretro.c +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" +endif -LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include -LOCAL_LDLIBS := -lz -llog +include $(CLEAR_VARS) +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 += $(EXTRA_INCLUDES) +LOCAL_LDFLAGS := -Wl,-version-script=$(FRONTEND_DIR)/link.T +LOCAL_LDLIBS := -lz -llog +LOCAL_ARM_MODE := arm + +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) + LOCAL_ARM_NEON := true +endif include $(BUILD_SHARED_LIBRARY)