plugins: try to untangle the CALLBACK mess

[pcsx_rearmed.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 96811d3..682e407 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -174,15 +174,22 @@ endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   COREFLAGS   += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -DGPU_NEON
+  COREFLAGS   += -DHAVE_bgr555_to_rgb565 -DHAVE_bgr888_to_x
   SOURCES_ASM += $(CORE_DIR)/gte_neon.S \
                  $(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
                  $(FRONTEND_DIR)/cspace_neon.S
   SOURCES_C   += $(NEON_DIR)/psx_gpu_if.c
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
-  COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
+  COREFLAGS   += -DUSE_GPULIB=1 -DGPU_UNAI
+  COREFLAGS   += -DHAVE_bgr555_to_rgb565
   SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
                  $(FRONTEND_DIR)/cspace_arm.S
   SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
+else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+  COREFLAGS   += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
+  COREFLAGS   += -DGPU_NEON -DSIMD_BUILD
+  SOURCES_C   += $(NEON_DIR)/psx_gpu_if.c \
+                 $(NEON_DIR)/psx_gpu/psx_gpu_simd.c
 else
   COREFLAGS += -fno-strict-aliasing -DGPU_PEOPS
   SOURCES_C += $(PEOPS_DIR)/gpulib_if.c