X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=3cfe52256e8713df455df18ddbccb15d6c112a38;hb=397ea1e535615c1fac77d744193f3478311a5c88;hp=501b0671aa63505473f5edc56934db43902f6767;hpb=cef87e9262aa48428071d46570e6d9f04ccb228f;p=pcsx_rearmed.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 501b0671..3cfe5225 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -19,7 +19,7 @@ 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
@@ -93,7 +93,7 @@ SOURCES_C += \
 SOURCES_ASM :=
 
 COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED
-COREFLAGS += -DHAVE_CHD -D_7ZIP_ST
+COREFLAGS += -DHAVE_MMAP=1 -DHAVE_PTHREAD=1 -DHAVE_POSIX_MEMALIGN=1 -DHAVE_CHD -D_7ZIP_ST
 
 ifeq ($(USE_LIBRETRO_VFS),1)
 SOURCES_C += \
@@ -113,6 +113,7 @@ endif
 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
@@ -132,6 +133,7 @@ else
   COREFLAGS   += -DDRC_DISABLE
 endif
   COREFLAGS   += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
+  COREFLAGS   += -DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER)
 
 ifeq ($(HAVE_ARI64),1)
   SOURCES_C   += $(DYNAREC_DIR)/new_dynarec.c \
@@ -145,6 +147,7 @@ ifeq ($(HAVE_ARI64),1)
   endif
 endif
   SOURCES_C   += $(DYNAREC_DIR)/emu_if.c
+  SOURCES_C   += $(DYNAREC_DIR)/events.c
 
 ifeq ($(HAVE_LIGHTREC),1)
   COREFLAGS   += -DLIGHTREC -DLIGHTREC_STATIC
@@ -154,6 +157,7 @@ ifeq ($(HAVE_LIGHTREC),1)
 		    $(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 \