fix a memory leak in one error case in LoadTGA and clean up things a little

[xonotic/darkplaces.git] / makefile.bsd

diff --git a/makefile.bsd b/makefile.bsd
index a4337a4d938de59f075e6c077f64dec14cb119d1..af0228e83a1edc070a95b123c77209694928e9a7 100644 (file)
--- a/makefile.bsd
+++ b/makefile.bsd
@@ -18,11 +18,9 @@ UNIX_X11LIBPATH=-L/usr/X11R6/lib
 
 # 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)
 
@@ -38,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