X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=96811d3c16b75e735af593f9fa64e35a70ce624f;hb=a5d30afeabe63d826d8fc1dc86aedf72cf03b457;hp=302852d42c0d0a4c09316b48d6285dbdf0ef83db;hpb=b0ec7ab5714ab82d5bfd26bd156048f764b16601;p=pcsx_rearmed.git

diff --git a/jni/Android.mk b/jni/Android.mk
index 302852d4..96811d3c 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -16,6 +16,7 @@ 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
@@ -120,10 +121,8 @@ else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
   HAVE_ARI64=1
 else ifeq ($(TARGET_ARCH_ABI),x86_64)
   HAVE_LIGHTREC=1
-  LIGHTREC_CUSTOM_MAP=1
 else ifeq ($(TARGET_ARCH_ABI),x86)
   HAVE_LIGHTREC=1
-  LIGHTREC_CUSTOM_MAP=1
 else
   COREFLAGS   += -DDRC_DISABLE
 endif
@@ -146,6 +145,7 @@ 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 \
@@ -165,9 +165,11 @@ ifeq ($(HAVE_LIGHTREC),1)
 					  $(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
+  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
+endif
 
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
@@ -182,8 +184,8 @@ else ifeq ($(TARGET_ARCH_ABI),armeabi)
                  $(FRONTEND_DIR)/cspace_arm.S
   SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
 else
-  COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
-  SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
+  COREFLAGS += -fno-strict-aliasing -DGPU_PEOPS
+  SOURCES_C += $(PEOPS_DIR)/gpulib_if.c
 endif
 
 GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"