Fix setinfo.

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index d13013b59c10f61ecb3cc4bb9b65358ac50ead6b..b6cebea7de804184b8e0746802c64de28f772a2d 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -16,11 +16,11 @@ CMD_CP=$(CMD_UNIXCP)
 CMD_MKDIR=$(CMD_UNIXMKDIR)
 
 # default targets
-TARGETS_DEBUG=sv-debug cl-debug sdl-debug
-TARGETS_PROFILE=sv-profile cl-profile sdl-profile
-TARGETS_RELEASE=sv-release cl-release sdl-release
-TARGETS_RELEASE_PROFILE=sv-release-profile cl-release-profile sdl-release-profile
-TARGETS_NEXUIZ=sv-nexuiz cl-nexuiz sdl-nexuiz
+TARGETS_DEBUG=sv-debug sdl-debug
+TARGETS_PROFILE=sv-profile sdl-profile
+TARGETS_RELEASE=sv-release sdl-release
+TARGETS_RELEASE_PROFILE=sv-release-profile sdl-release-profile
+TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz
 
 # Link options
 DP_LINK_ZLIB?=shared
@@ -30,15 +30,6 @@ DP_LINK_CRYPTO?=dlopen
 DP_LINK_CRYPTO_RIJNDAEL?=dlopen
 
 ###### Optional features #####
-DP_CDDA?=enabled
-.if $(DP_CDDA) == "enabled"
-  OBJ_SDLCD=$(OBJ_CD_COMMON) cd_sdl.o
-  OBJ_BSDCD=$(OBJ_CD_COMMON) cd_bsd.o
-.else
-  OBJ_SDLCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-  OBJ_BSDCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-.endif
-
 DP_VIDEO_CAPTURE?=enabled
 .if $(DP_VIDEO_CAPTURE) == "enabled"
   CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE
@@ -60,13 +51,10 @@ DEFAULT_SNDAPI=OSS
 .else
 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)
 LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
@@ -74,10 +62,8 @@ SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11)
 SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
 SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
 
-EXE_CL=$(EXE_UNIXCL)
 EXE_SV=$(EXE_UNIXSV)
 EXE_SDL=$(EXE_UNIXSDL)
-EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
 EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
 EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
@@ -129,31 +115,6 @@ CFLAGS_CRYPTO_RIJNDAEL=
 .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
-
-
 ##### Extra CFLAGS #####
 
 CFLAGS_MAKEDEP=-MD
@@ -165,7 +126,6 @@ CFLAGS_FS=
 
 CFLAGS_PRELOAD=
 .ifdef DP_PRELOAD_DEPENDENCIES
-LDFLAGS_CL+=$(LDFLAGS_UNIXCL_PRELOAD)
 LDFLAGS_SV+=$(LDFLAGS_UNIXSV_PRELOAD)
 LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD)
 CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)