X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=95bc0f2942319878a4c1b875dd7a35eb9cda5fe6;hp=89fc2a9c14c115b7a2675aa6a619f32e9d990e09;hb=5d8e3bf87667638765c6473ff82242ec3158cdac;hpb=384f5f43a20879e2553acd17b76e82059092fafb diff --git a/Makefile b/Makefile index 89fc2a9c..95bc0f29 100644 --- a/Makefile +++ b/Makefile @@ -33,13 +33,17 @@ 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 OBJS += libpcsxcore/new_dynarec/pcsxmem.o endif OBJS += libpcsxcore/new_dynarec/emu_if.o -libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c +libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \ + libpcsxcore/new_dynarec/pcsxmem_inline.c ifdef DRC_DBG libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -DDRC_DBG @@ -48,6 +52,7 @@ 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 ifeq "$(USE_OSS)" "1" plugins/dfsound/%.o: CFLAGS += -DUSEOSS OBJS += plugins/dfsound/oss.o @@ -134,7 +139,7 @@ clean_plugins: PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh -VER ?= $(shell git describe --abbrev=0 master) +VER ?= $(shell git describe master) rel: pcsx $(PLUGINS) \ pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \