X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=BSDmakefile;h=36f0f82bce7aecea8ec38a456ff593bd70da605c;hp=ee3f74023831cd33fab8045fa957ac9d9c39fe7e;hb=9804c2369e4ac79331fc05bf37655bdf76457f2d;hpb=3363fb8484e2d85676337135e41e85e54d72451e

diff --git a/BSDmakefile b/BSDmakefile
index ee3f7402..36f0f82b 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -7,13 +7,12 @@ DP_MAKE_TARGET=bsd
 .endif
 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
@@ -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
 
-###### 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
 
@@ -140,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 #####