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

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index 61189afef4c2ba38f724e3fdb09bf568ac4ad76f..36f0f82bce7aecea8ec38a456ff593bd70da605c 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -7,13 +7,12 @@ DP_MAKE_TARGET=bsd
 .endif
 DP_ARCH != uname
 
 .endif
 DP_ARCH != uname
 

+

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

-# Commands
+# Command used to delete files

 CMD_RM=$(CMD_UNIXRM)
 CMD_RM=$(CMD_UNIXRM)

-CMD_CP=$(CMD_UNIXCP)
-CMD_MKDIR=$(CMD_UNIXMKDIR)

 
 # default targets
 TARGETS_DEBUG=sv-debug cl-debug sdl-debug
 
 # default targets
 TARGETS_DEBUG=sv-debug cl-debug sdl-debug


@@ -22,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
 


@@ -90,13 +79,6 @@ CFLAGS_CRYPTO=
 LIB_CRYPTO_RIJNDAEL=
 CFLAGS_CRYPTO_RIJNDAEL=
 
 LIB_CRYPTO_RIJNDAEL=
 CFLAGS_CRYPTO_RIJNDAEL=
 

-# modplug
-# now ogg is mostly used, modplug is required rarely, keep it dlopen by default
-# LIB_SND_MODPLUG=-lmodplug
-# CFLAGS_SND_MODPLUG=-DLINK_TO_LIBMODPLUG
-LIB_SND_MODPLUG=
-CFLAGS_SND_MODPLUG=
-

 .endif
 
 
 .endif
 
 


@@ -147,7 +129,7 @@ CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
 
 MAKE:=$(MAKE) -f BSDmakefile
 
 
 MAKE:=$(MAKE) -f BSDmakefile
 

-DO_LD=$(CC) -o ../../../$@ $> $(LDFLAGS)
+DO_LD=$(CC) -o $@ $> $(LDFLAGS)

 
 
 ##### Definitions shared by all makefiles #####
 
 
 ##### Definitions shared by all makefiles #####