X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jni%2FAndroid.mk;h=96811d3c16b75e735af593f9fa64e35a70ce624f;hb=03535202b4b624c534340322646fb7f4062e3f53;hp=ef1d6126680fbbb893cd6792953b5f9d5443dfcc;hpb=6aa5a78c63354b8521de47f3ff14f925cf3548f3;p=pcsx_rearmed.git

diff --git a/jni/Android.mk b/jni/Android.mk
index ef1d6126..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
@@ -144,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 \
@@ -163,7 +165,7 @@ 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 $(CORE_DIR)/lightrec/tlsf/tlsf.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
@@ -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)"