X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=3ebdf97a95b09d6746ee658e36922db48c3603eb;hb=9c9d02e498a0ec5de6ea83f58b79fb972887c650;hp=1b24c0b5907076adf9c3f485626e50af622bb90c;hpb=3733c6fefd2bcc15a637139c036518762aa5956b;p=pcsx_rearmed.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 1b24c0b5..3ebdf97a 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -4,6 +4,8 @@ $(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV
 $(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
+
 ROOT_DIR     := $(LOCAL_PATH)/..
 CORE_DIR     := $(ROOT_DIR)/libpcsxcore
 SPU_DIR      := $(ROOT_DIR)/plugins/dfsound
@@ -14,6 +16,8 @@ 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
 
 # core
 SOURCES_C := $(CORE_DIR)/cdriso.c \
@@ -68,10 +72,55 @@ SOURCES_C += $(FRONTEND_DIR)/main.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
+
 # dynarec
 SOURCES_C += $(DYNAREC_DIR)/backends/psx/emu_if.c
 
 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
 
 ifeq ($(TARGET_ARCH),arm)
   SOURCES_ASM := $(CORE_DIR)/gte_arm.S \
@@ -91,10 +140,14 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
                  $(FRONTEND_DIR)/cspace_neon.S
   SOURCES_C   += $(NEON_DIR)/psx_gpu_if.c
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
-  SOURCES_ASM += $(UNAI_DIR)/gpu_arm.s \
+  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
 
@@ -108,6 +161,8 @@ 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_LDFLAGS       := -Wl,-version-script=$(FRONTEND_DIR)/link.T
 LOCAL_LDLIBS        := -lz -llog
 LOCAL_ARM_MODE      := arm