aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2011-12-07 01:21:27 +0200
committernotaz2011-12-07 01:21:27 +0200
commitee318a534ddda786d3727584cc6784bc5729276d (patch)
tree4e9196f12eddb2a016e1fb029b7cf73fbc5ec5e4
parentfb4c6fba4c83b2f00a78c331fd56e5d995ce02ab (diff)
downloadpcsx_rearmed-ee318a534ddda786d3727584cc6784bc5729276d.tar.gz
pcsx_rearmed-ee318a534ddda786d3727584cc6784bc5729276d.tar.bz2
pcsx_rearmed-ee318a534ddda786d3727584cc6784bc5729276d.zip
switch default gpu to gpu_neon
-rw-r--r--Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 7288ef1..4ca807a 100644
--- a/Makefile
+++ b/Makefile
@@ -95,16 +95,17 @@ LDFLAGS += -lasound
endif
# gpu
+OBJS += plugins/gpu_neon/gpu.o
# note: code is not safe for strict-aliasing? (Castlevania problems)
-plugins/dfxvideo/%.o: CFLAGS += -fno-strict-aliasing
-OBJS += plugins/dfxvideo/gpu.o
-plugins/dfxvideo/gpu.o: plugins/dfxvideo/fps.c plugins/dfxvideo/prim.c \
- plugins/dfxvideo/gpu.c plugins/dfxvideo/soft.c
+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
ifdef X11
-LDFLAGS += -lX11 -lXv
-OBJS += plugins/dfxvideo/draw.o
+LDFLAGS += -lX11 `sdl-config --libs`
+OBJS += plugins/gpu_neon/vout_sdl.o
+plugins/gpu_neon/vout_sdl.o: CFLAGS += `sdl-config --cflags`
else
-OBJS += plugins/dfxvideo/draw_fb.o
+OBJS += plugins/gpu_neon/vout_fb.o
endif
# cdrcimg