X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=bf1c3c5a3b5e2c39d60204abb5c91ff36aa50a90;hb=87cc59de47301ff0a2e71b5ece28447ec77b0153;hp=06b437957f9b690bfb813a45398a95a705fd0086;hpb=89d7ac2a566bc0ca8a12bdc6f920d9ee0578163a;p=pcsx_rearmed.git diff --git a/jni/Android.mk b/jni/Android.mk index 06b43795..bf1c3c5a 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,96 +1,216 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) +$(shell cd "$(LOCAL_PATH)" && ((git describe || 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_)) -APP_DIR := ../../src +HAVE_CHD ?= 1 + +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 +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)/debug.c \ + $(CORE_DIR)/decode_xa.c \ + $(CORE_DIR)/disr3000a.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)/socket.c \ + $(CORE_DIR)/spu.c \ + $(CORE_DIR)/gte.c \ + $(CORE_DIR)/gte_nf.c \ + $(CORE_DIR)/gte_divider.c -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 +# 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 -ifeq ($(TARGET_ARCH),arm) - LOCAL_ARM_MODE := arm +# gpu +SOURCES_C += $(GPU_DIR)/gpu.c \ + $(GPU_DIR)/vout_pl.c - LOCAL_CFLAGS += -DANDROID_ARM +# cdrcimg +SOURCES_C += $(CDR_DIR)/cdrcimg.c - LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.S +# 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)/crypto/md5.c \ + $(DEPS_DIR)/crypto/sha1.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitmath.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitreader.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/cpu.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/crc.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/float.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/format.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/md5.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/memory.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_iterators.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_object.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/stream_decoder.c \ + $(DEPS_DIR)/flac-1.3.2/src/libFLAC/window.c \ + $(DEPS_DIR)/lzma-16.04/C/Alloc.c \ + $(DEPS_DIR)/lzma-16.04/C/Bra86.c \ + $(DEPS_DIR)/lzma-16.04/C/Bra.c \ + $(DEPS_DIR)/lzma-16.04/C/BraIA64.c \ + $(DEPS_DIR)/lzma-16.04/C/CpuArch.c \ + $(DEPS_DIR)/lzma-16.04/C/Delta.c \ + $(DEPS_DIR)/lzma-16.04/C/LzFind.c \ + $(DEPS_DIR)/lzma-16.04/C/Lzma86Dec.c \ + $(DEPS_DIR)/lzma-16.04/C/Lzma86Enc.c \ + $(DEPS_DIR)/lzma-16.04/C/LzmaDec.c \ + $(DEPS_DIR)/lzma-16.04/C/LzmaEnc.c \ + $(DEPS_DIR)/lzma-16.04/C/LzmaLib.c \ + $(DEPS_DIR)/lzma-16.04/C/Sort.c \ + $(DEPS_DIR)/libchdr/bitstream.c \ + $(DEPS_DIR)/libchdr/cdrom.c \ + $(DEPS_DIR)/libchdr/chd.c \ + $(DEPS_DIR)/libchdr/flac.c \ + $(DEPS_DIR)/libchdr/huffman.c +SOURCES_ASM := + +COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED +COREFLAGS += -DPACKAGE_VERSION=\"1.3.2\" -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST -DHAVE_SYS_PARAM_H +COREFLAGS += -DHAVE_CHD + +HAVE_ARI64=0 +HAVE_LIGHTREC=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 +else ifeq ($(TARGET_ARCH_ABI),x86_64) + HAVE_LIGHTREC=1 +else ifeq ($(TARGET_ARCH_ABI),x86) + HAVE_LIGHTREC=1 +else + COREFLAGS += -DDRC_DISABLE +endif - # 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 +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 +endif - # spu - LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S +ifeq ($(HAVE_LIGHTREC),1) + COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC + EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \ + $(DEPS_DIR)/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 + 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 +endif - ifeq ($(NO_NEON_BUILD),1) - # gpu - LOCAL_CFLAGS += -DREARMED - LOCAL_SRC_FILES += ../plugins/gpulib/cspace.c ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s - else - LOCAL_ARM_NEON := true - LOCAL_CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP - LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../plugins/gpulib/cspace_neon.s - # gpu - LOCAL_SRC_FILES += ../plugins/gpu_neon/psx_gpu_if.c ../plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S - endif +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) + COREFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP + SOURCES_ASM += $(CORE_DIR)/gte_neon.S \ + $(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 + COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__" + 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 + COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__" + SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp endif -ifeq ($(TARGET_ARCH),x86) - LOCAL_CFLAGS += -DANDROID_X86 +GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" +ifneq ($(GIT_VERSION)," unknown") + COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif -ifeq ($(TARGET_ARCH),mips) - LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ +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)/flac-1.3.2/include $(DEPS_DIR)/flac-1.3.2/src/libFLAC/include $(DEPS_DIR)/lzma-16.04/C $(DEPS_DIR)/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 - -ifneq ($(TARGET_ARCH),arm) - # gpu - LOCAL_CFLAGS += -DREARMED - LOCAL_SRC_FILES += ../plugins/gpulib/cspace.c ../plugins/gpu_unai/gpulib_if.cpp +ifeq ($(TARGET_ARCH),arm) + LOCAL_LDLIBS += -Wl,-no-warn-shared-textrel endif -$(shell cd "$(LOCAL_PATH)" && ((git describe || 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_)) - -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 - -# libretro -LOCAL_SRC_FILES += ../frontend/libretro.c - -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 $(BUILD_SHARED_LIBRARY)