diff options
author | notaz | 2015-01-25 23:21:40 +0200 |
---|---|---|
committer | notaz | 2015-01-25 23:21:40 +0200 |
commit | 4e9adec1930817da2031fd044dc74c0f454a0079 (patch) | |
tree | 854c202544c75e486d4243b34366162f03f082eb /Makefile | |
parent | be1294d017cba3f18cf66597f0cbed207fed26bf (diff) | |
parent | ba10822d813767632c528102055e3eeb54730b2c (diff) | |
download | pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.gz pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.bz2 pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.zip |
Merge branch 'upstream' into libretro
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -83,6 +83,11 @@ plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \ ifeq "$(ARCH)" "arm" OBJS += plugins/dfsound/arm_utils.o endif +ifeq "$(HAVE_C64_TOOLS)" "1" +plugins/dfsound/spu.o: CFLAGS += -DC64X_DSP +plugins/dfsound/spu.o: plugins/dfsound/spu_c64x.c +frontend/menu.o: CFLAGS += -DC64X_DSP +endif ifneq ($(findstring oss,$(SOUND_DRIVERS)),) plugins/dfsound/out.o: CFLAGS += -DHAVE_OSS OBJS += plugins/dfsound/oss.o @@ -288,7 +293,7 @@ endif ifeq "$(PLATFORM)" "pandora" PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh -rel: pcsx $(PLUGINS) \ +rel: pcsx plugins/dfsound/pcsxr_spu_area3.out $(PLUGINS) \ 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 |