WIN32_LEAN_AND_MEAN patch from Willis to speed up MSVC compilation

[xonotic/darkplaces.git] / makefile.bsd

diff --git a/makefile.bsd b/makefile.bsd
index a4337a4d938de59f075e6c077f64dec14cb119d1..86c5d28f9922f3d5f4ab726932c88732abd88536 100644 (file)
--- a/makefile.bsd
+++ b/makefile.bsd
@@ -1,4 +1,4 @@
-#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
+#####  DP_MAKE_TARGET autodetection and arch specific variables #####
 
 .ifndef DP_MAKE_TARGET
 
@@ -18,15 +18,15 @@ 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)
 
 OBJ_CL=$(OBJ_GLX)
+OBJ_ICON=
+OBJ_ICON_NEXUIZ=
 
 LDFLAGS_CL=$(LDFLAGS_BSDCL)
 LDFLAGS_SV=$(LDFLAGS_BSDSV)
@@ -34,10 +34,38 @@ LDFLAGS_SV=$(LDFLAGS_BSDSV)
 EXE_CL=$(EXE_UNIXCL)
 EXE_SV=$(EXE_UNIXSV)
 EXE_SDL=$(EXE_UNIXSDL)
+EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
 .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