X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu_neon%2FMakefile;h=93839d23883b9216e1e28c5cbc6f4cb37f1035fa;hp=adb509707a3952c34c0fa931eb83ab0fafe2bab4;hb=9f58cabba9806e2c365c64f7a3701efa6282aa72;hpb=a80ae4a0353fce94df700ec84222d3c56c3d813a

diff --git a/plugins/gpu_neon/Makefile b/plugins/gpu_neon/Makefile
index adb50970..93839d23 100644
--- a/plugins/gpu_neon/Makefile
+++ b/plugins/gpu_neon/Makefile
@@ -2,32 +2,27 @@ CC = $(CROSS_COMPILE)gcc
 
 ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
 
-CFLAGS += -ggdb -Wall -fPIC -O2
-CFLAGS += -fno-strict-aliasing
+HAVE_NEON = $(shell $(CC) -E -dD $(CFLAGS_) ../gpulib/gpu.h | grep -q '__ARM_NEON__ 1' && echo 1)
 
-LDFLAGS += -shared -Wl,-soname,$(TARGET)
-SRC += gpu.c
+# FIXME: rework NEON detection to get rid of this
 ifeq "$(ARCH)" "arm"
-TARGET = gpu_neon.so
-CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-SRC += vout_fb.c ../../frontend/cspace_neon.s
-else
-TARGET = gpu_neon.so.x86
-CFLAGS += `sdl-config --cflags` -m32
-LDFLAGS += `sdl-config --libs`
-SRC += vout_sdl.c
+ ARM_CORTEXA8 ?= 1
+ ifeq "$(ARM_CORTEXA8)" "1"
+  CFLAGS_ += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+ endif
 endif
-PEOPS=1
-ifndef PEOPS
+
+CFLAGS += -ggdb -Wall -fPIC -O2
+
 SRC += psx_gpu_if.c
+
+CFLAGS += -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
+ifeq "$(HAVE_NEON)" "1"
+SRC += psx_gpu/psx_gpu_arm_neon.S
+CFLAGS += -DNEON_BUILD
 else
-SRC += peops_if.c
+CFLAGS += -fno-strict-aliasing
 endif
 
-all: $(TARGET)
-
-$(TARGET): $(SRC)
-	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
-
-clean:
-	$(RM) $(TARGET)
+BIN_GPULIB = gpu_neon.so
+include ../gpulib/gpulib.mak