X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile.bsd;h=af0228e83a1edc070a95b123c77209694928e9a7;hb=8ba97159796cbbab3a88e2230f62adc8d422b5ce;hp=81c080dff64fdc723d2def055994a453e54bb56e;hpb=2c439d4875103b25f47721b35fd16dbdd3d70807;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.bsd b/makefile.bsd
index 81c080df..af0228e8 100644
--- a/makefile.bsd
+++ b/makefile.bsd
@@ -11,16 +11,16 @@ DP_ARCH != uname
 # Command used to delete files
 CMD_RM=$(CMD_UNIXRM)
 
+UNIX_X11LIBPATH=-L/usr/X11R6/lib
+
 # BSD configuration
 .if $(DP_MAKE_TARGET) == "bsd"
 
 # FreeBSD uses OSS
 .if $(DP_ARCH) == "FreeBSD"
-OBJ_SOUND=$(OBJ_OSSSOUND)
-LIB_SOUND=$(LIB_OSSSOUND)
+DEFAULT_SNDAPI=OSS
 .else
-OBJ_SOUND=$(OBJ_BSDSOUND)
-LIB_SOUND=$(LIB_BSDSOUND)
+DEFAULT_SNDAPI=BSD
 .endif
 OBJ_CD=$(OBJ_BSDCD)
 
@@ -36,6 +36,31 @@ EXE_SDL=$(EXE_UNIXSDL)
 .endif
 
 
+##### Sound configuration #####
+
+.ifndef DP_SOUND_API
+DP_SOUND_API=$(DEFAULT_SNDAPI)
+.endif
+
+# NULL: no sound
+.if $(DP_SOUND_API) == "NULL"
+OBJ_SOUND=$(OBJ_SND_NULL)
+LIB_SOUND=$(LIB_SND_NULL)
+.endif
+
+# OSS: Open Sound System
+.if $(DP_SOUND_API) == "OSS"
+OBJ_SOUND=$(OBJ_SND_OSS)
+LIB_SOUND=$(LIB_SND_OSS)
+.endif
+
+# BSD: BSD / Sun audio API
+.if $(DP_SOUND_API) == "BSD"
+OBJ_SOUND=$(OBJ_SND_BSD)
+LIB_SOUND=$(LIB_SND_BSD)
+.endif
+
+
 ##### BSD Make specific definitions #####
 
 MAKE:=$(MAKE) -f makefile.bsd