X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=611d5c340af156c66988a47f02189c3ba00be88e;hp=4ca807ab8363d544d1f1778c92a624db0aa4397e;hb=7a518516f8c04644e4ca4bb6bf38a8886e4ae42e;hpb=ee318a534ddda786d3727584cc6784bc5729276d

diff --git a/Makefile b/Makefile
index 4ca807ab..611d5c34 100644
--- a/Makefile
+++ b/Makefile
@@ -96,10 +96,16 @@ endif
 
 # gpu
 OBJS += plugins/gpu_neon/gpu.o
+ifeq "$(HAVE_NEON)" "1"
+OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o
+plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
+plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c
+else
 # note: code is not safe for strict-aliasing? (Castlevania problems)
 plugins/gpu_neon/peops_if.o: CFLAGS += -fno-strict-aliasing
 plugins/gpu_neon/peops_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c
 OBJS += plugins/gpu_neon/peops_if.o
+endif
 ifdef X11
 LDFLAGS += -lX11 `sdl-config --libs`
 OBJS += plugins/gpu_neon/vout_sdl.o
@@ -170,17 +176,19 @@ frontend/revision.h: FORCE
 	@rm $@_
 .PHONY: FORCE
 
+%.o: %.S
+	$(CC) $(CFLAGS) -c $^ -o $@
 
 $(TARGET): $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
 
-PLUGINS ?= plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \
-	plugins/gpu-gles/gpuGLES.so plugins/gpu_neon/gpu_neon.so
+PLUGINS ?= plugins/spunull/spunull.so plugins/gpu-gles/gpuGLES.so \
+	plugins/gpu_neon/gpu_unai.so plugins/gpu_neon/gpu_peops.so
 
 $(PLUGINS):
 	make -C $(dir $@)
 
-clean:
+clean: $(PLAT_CLEAN)
 	$(RM) $(TARGET) $(OBJS) $(TARGET).map
 
 clean_plugins:
@@ -202,5 +210,6 @@ rel: pcsx $(PLUGINS) \
 	sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml
 	rm out/pcsx.pxml.templ
 	mv out/*.so out/plugins/
-	mv out/plugins/gpu_neon.so out/plugins/gpuPEOPS2.so
+	mv out/plugins/gpu_unai.so out/plugins/gpuPCSX4ALL.so
+	mv out/plugins/gpu_peops.so out/plugins/gpuPEOPS.so
 	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i frontend/pandora/pcsx.png -c