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
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)
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"
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
OBJS += frontend/plat_pandora.o
else
ifeq "$(PLATFORM)" "caanoo"
-OBJS += frontend/plat_pollux.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
VER ?= $(shell git describe master)
rel: pcsx $(PLUGINS) \
- pandora/pcsx.sh pandora/pcsx.pxml.templ pandora/pcsx.png \
- pandora/picorestore pandora/readme.txt pandora/skin COPYING
+ frontend/pandora/pcsx.sh frontend/pandora/pcsx.pxml.templ frontend/pandora/pcsx.png \
+ frontend/pandora/picorestore frontend/pandora/skin readme.txt COPYING
rm -rf out
mkdir -p out/plugins
cp -r $^ out/
rm out/pcsx.pxml.templ
mv out/*.so out/plugins/
mv out/plugins/gpu_neon.so out/plugins/gpuPEOPS2.so
- $(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i pandora/pcsx.png -c
+ $(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i frontend/pandora/pcsx.png -c