X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=8b7d83c51f9c6fa51d21de59e6f2596ec013b321;hp=8c2628c25fc31ee7a2bf62d75aab0b1c22edb5df;hb=ddc0a02a811034532a8e013c14091b61a89439ba;hpb=61bc6d40b4f6f846a0ae1b73ceecdca893c14df4

diff --git a/Makefile b/Makefile
index 8c2628c2..8b7d83c5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # default stuff goes here, so that config can override
 TARGET = pcsx
 CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
-LDLIBS += -lpthread -ldl -lpng -lz -lm
+LDLIBS += -lpthread -lm
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
@@ -26,6 +26,7 @@ endif
 -include Makefile.local
 
 CC_LINK = $(CC)
+LDLIBS += $(MAIN_LDLIBS)
 
 # core
 OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \
@@ -64,23 +65,32 @@ endif
 
 # spu
 OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
-	plugins/dfsound/registers.o plugins/dfsound/spu.o
+	plugins/dfsound/registers.o plugins/dfsound/spu.o \
+	plugins/dfsound/out.o plugins/dfsound/nullsnd.o
 plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
 	plugins/dfsound/xa.c
 ifeq "$(ARCH)" "arm"
 OBJS += plugins/dfsound/arm_utils.o
 endif
-ifeq "$(SOUND_DRIVER)" "oss"
-plugins/dfsound/%.o: CFLAGS += -DUSEOSS
+ifneq ($(findstring oss,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_OSS
 OBJS += plugins/dfsound/oss.o
 endif
-ifeq "$(SOUND_DRIVER)" "alsa"
-plugins/dfsound/%.o: CFLAGS += -DUSEALSA
+ifneq ($(findstring alsa,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_ALSA
 OBJS += plugins/dfsound/alsa.o
 LDLIBS += -lasound
 endif
-ifeq "$(SOUND_DRIVER)" "none"
-OBJS += plugins/dfsound/nullsnd.o
+ifneq ($(findstring sdl,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_SDL
+OBJS += plugins/dfsound/sdl.o
+endif
+ifneq ($(findstring pulseaudio,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_PULSE
+OBJS += plugins/dfsound/pulseaudio.o
+endif
+ifneq ($(findstring libretro,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_LIBRETRO
 endif
 
 # builtin gpu