X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=21f3ef6ba21eba5e7dfbc166dbbf31b6935cc795;hp=8d49f10f99420b9069d4b23c3aa30cb4b81e91ff;hb=3609c474ee3cec2e06fa5d2c1578dd9de1d3f7a5;hpb=59f1c85c77cb3e598f317409142599ba92e23d91

diff --git a/Makefile b/Makefile
index 8d49f10f..21f3ef6b 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
@@ -123,7 +129,7 @@ OBJS += maemo/hildon.o maemo/main.o
 maemo/%.o: maemo/%.c
 else
 OBJS += frontend/menu.o frontend/linux/in_evdev.o
-OBJS += frontend/common/input.o frontend/linux/oshide.o
+OBJS += frontend/common/input.o frontend/linux/xenv.o
 
 ifeq "$(PLATFORM)" "pandora"
 frontend/%.o: CFLAGS += -DVOUT_FBDEV
@@ -170,6 +176,8 @@ frontend/revision.h: FORCE
 	@rm $@_
 .PHONY: FORCE
 
+%.o: %.S
+	$(CC) $(CFLAGS) -c $^ -o $@
 
 $(TARGET): $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map