X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=28677917375ec91ffa2ba43cbc969f65945f4d45;hb=915cd7d7a2b7d4c5f3dd53219b36f62184d68c65;hp=a4bf7479f6cf99d489d6716e9a4d75cf4da5aa1e;hpb=47747a785136e7f0dc17ec0e976c78dbff18b974;p=pcsx_rearmed.git diff --git a/jni/Android.mk b/jni/Android.mk index a4bf7479..28677917 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 @@ -15,6 +17,7 @@ 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 \ @@ -155,6 +158,7 @@ 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