switch default gpu to gpu_neon

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index 32e5401..4ca807a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ TARGET = pcsx
 ARCH = $(shell $(GCC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
 
 CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
-LDFLAGS += -lz -lpthread -ldl -lpng
+LDFLAGS += -lpthread -ldl -lpng -lz -lm
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
@@ -34,7 +34,7 @@ ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 endif
 ifeq "$(ARM926)" "1"
 GCC_CFLAGS += -mcpu=arm926ej-s -mtune=arm926ej-s
-ASFLAGS += -mcpu=arm926ej-s
+ASFLAGS += -mcpu=arm926ej-s -mfloat-abi=softfp
 endif
 endif
 CFLAGS += $(GCC_CFLAGS)
@@ -81,7 +81,7 @@ OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
        plugins/dfsound/registers.o plugins/dfsound/spu.o
 plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
        plugins/dfsound/xa.c
-ifeq "$(HAVE_NEON)" "1"
+ifeq "$(ARCH)" "arm"
 OBJS += plugins/dfsound/arm_utils.o
 endif
 ifeq "$(USE_OSS)" "1"
@@ -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
@@ -131,8 +132,8 @@ OBJS += frontend/plat_omap.o
 OBJS += frontend/plat_pandora.o
 else
 ifeq "$(PLATFORM)" "caanoo"
-OBJS += frontend/plat_pollux.o frontend/blit320.o
-OBJS += frontend/warm/warm.o
+OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o
+OBJS += frontend/gp2x/in_gp2x.o frontend/warm/warm.o
 else
 OBJS += frontend/plat_dummy.o
 endif