X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=900a5d837070032ed072af84bac661036f81a2b2;hp=0a99925b06da3c060f49c573b951751fa0cd9c1d;hb=b8e744ce04eaf294d0c06aca6b20b410122bf4ed;hpb=cbbab9cd861a35ecc38546d7291c3cc655b4f5ed diff --git a/Makefile b/Makefile index 0a99925b..900a5d83 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,9 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o libpcsxcore/psxhle.o \ libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \ libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o +ifeq "$(ARCH)" "arm" +OBJS += libpcsxcore/gte_neon.o +endif # dynarec ifndef NO_NEW_DRC OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o @@ -49,7 +52,9 @@ endif # spu OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \ plugins/dfsound/registers.o plugins/dfsound/spu.o -plugins/dfsound/spu.o: plugins/dfsound/xa.c +plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \ + plugins/dfsound/xa.c +plugins/dfsound/%.o: CFLAGS += -Wall ifeq "$(USE_OSS)" "1" plugins/dfsound/%.o: CFLAGS += -DUSEOSS OBJS += plugins/dfsound/oss.o @@ -61,8 +66,11 @@ LDFLAGS += -lasound endif # gpu -plugins/dfxvideo/%.o: CFLAGS += -Wall +# note: code is not safe for strict-aliasing? (Castlevania problems) +plugins/dfxvideo/%.o: CFLAGS += -Wall -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 ifdef X11 LDFLAGS += -lX11 -lXv OBJS += plugins/dfxvideo/draw.o @@ -140,7 +148,7 @@ VER ?= $(shell git describe master) rel: pcsx $(PLUGINS) \ pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \ - pandora/picorestore pandora/readme.txt skin COPYING + pandora/picorestore pandora/readme.txt pandora/skin COPYING rm -rf out mkdir -p out/plugins cp -r $^ out/