Revert "Make cdda optional, server does not need to play music" because it

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index 8c4561fbe185be381fa9639ab6f45e6fb5dda2a2..36f0f82bce7aecea8ec38a456ff593bd70da605c 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -7,6 +7,7 @@ DP_MAKE_TARGET=bsd
 .endif
 DP_ARCH != uname
 
 .endif
 DP_ARCH != uname
 

+

 # Makefile name
 MAKEFILE=BSDmakefile
 
 # Makefile name
 MAKEFILE=BSDmakefile
 


@@ -20,16 +21,6 @@ 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_RELEASE_PROFILE=sv-release-profile cl-release-profile sdl-release-profile
 TARGETS_NEXUIZ=sv-nexuiz cl-nexuiz sdl-nexuiz
 

-###### 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
-

 # X11 libs
 UNIX_X11LIBPATH=/usr/X11R6/lib
 
 # X11 libs
 UNIX_X11LIBPATH=/usr/X11R6/lib