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

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index fc8c3e4f706086535dcb82e404ee4c1e06a0dde8..cdf4c6417d8aace624729c342673fef45cef5dac 100644 (file)
--- a/makefile
+++ b/makefile
@@ -32,18 +32,12 @@ ifneq ($(DP_MAKE_TARGET), mingw)
        DP_MACHINE:=$(shell uname -m)
 endif
 
-# Makefile name
-MAKEFILE=makefile
 
-# Commands
+# Command used to delete files
 ifdef windir
        CMD_RM=del
-       CMD_CP=copy /y
-       CMD_MKDIR=mkdir
 else
        CMD_RM=$(CMD_UNIXRM)
-       CMD_CP=$(CMD_UNIXCP)
-       CMD_MKDIR=$(CMD_UNIXMKDIR)
 endif
 
 # 64bits AMD CPUs use another lib directory
@@ -60,20 +54,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
-ifeq ($(DP_CDDA), enabled)
-       OBJ_SDLCD=$(OBJ_CD_COMMON) cd_sdl.o
-       OBJ_LINUXCD=$(OBJ_CD_COMMON) cd_linux.o
-       OBJ_BSDCD=$(OBJ_CD_COMMON) cd_bsd.o
-       OBJ_WINCD=$(OBJ_CD_COMMON) cd_win.o
-else
-       OBJ_SDLCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-       OBJ_LINUXCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-       OBJ_BSDCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-       OBJ_WINCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-endif
-
 # Linux configuration
 ifeq ($(DP_MAKE_TARGET), linux)
        DEFAULT_SNDAPI=ALSA
@@ -378,7 +358,7 @@ endif
 
 ##### GNU Make specific definitions #####
 
-DO_LD=$(CC) -o ../../../$@ $^ $(LDFLAGS)
+DO_LD=$(CC) -o $@ $^ $(LDFLAGS)
 
 
 ##### Definitions shared by all makefiles #####