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

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index 74496ed..36f0f82 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -11,10 +11,8 @@ DP_ARCH != uname
 # Makefile name
 MAKEFILE=BSDmakefile
 
-# Commands
+# Command used to delete files
 CMD_RM=$(CMD_UNIXRM)
-CMD_CP=$(CMD_UNIXCP)
-CMD_MKDIR=$(CMD_UNIXMKDIR)
 
 # default targets
 TARGETS_DEBUG=sv-debug cl-debug sdl-debug
@@ -81,13 +79,6 @@ CFLAGS_CRYPTO=
 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
 
 
@@ -138,7 +129,7 @@ CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
 
 MAKE:=$(MAKE) -f BSDmakefile
 
-DO_LD=$(CC) -o ../../../$@ $> $(LDFLAGS)
+DO_LD=$(CC) -o $@ $> $(LDFLAGS)
 
 
 ##### Definitions shared by all makefiles #####