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

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 1469f7e7bd12f90cce58d9d5377c5454c0cf2e16..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
@@ -84,7 +78,9 @@ ifeq ($(DP_MAKE_TARGET), linux)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
-       DP_LINK_LIBS=shared
+       DP_LINK_ZLIB?=shared
+       DP_LINK_JPEG?=shared
+       DP_LINK_ODE?=dlopen
 endif
 
 # Mac OS X configuration
@@ -115,7 +111,9 @@ ifeq ($(DP_MAKE_TARGET), macosx)
                CFLAGS_MAKEDEP=
        endif
 
-       DP_LINK_LIBS=dlopen
+       DP_LINK_ZLIB?=shared
+       DP_LINK_JPEG?=shared
+       DP_LINK_ODE?=dlopen
 
        # on OS X, we don't build the CL by default because it uses deprecated
        # and not-implemented-in-64bit Carbon
@@ -152,7 +150,9 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
-       DP_LINK_LIBS=shared
+       DP_LINK_ZLIB?=shared
+       DP_LINK_JPEG?=shared
+       DP_LINK_ODE?=dlopen
 endif
 
 # BSD configuration
@@ -183,7 +183,9 @@ endif
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
-       DP_LINK_LIBS=shared
+       DP_LINK_ZLIB?=shared
+       DP_LINK_JPEG?=shared
+       DP_LINK_ODE?=dlopen
 endif
 
 # Win32 configuration
@@ -238,37 +240,39 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 
-       DP_LINK_LIBS=shared
+       DP_LINK_ZLIB?=dlopen
+       DP_LINK_JPEG?=shared
+       DP_LINK_ODE?=dlopen
 endif
 
 # set these to "" if you want to use dynamic loading instead
 # zlib
-ifeq ($(DP_LINK_LIBS), shared)
+ifeq ($(DP_LINK_ZLIB), shared)
        CFLAGS_LIBZ=-DLINK_TO_ZLIB
        LIB_Z=-lz
 endif
-ifeq ($(DP_LINK_LIBS), dlopen)
+ifeq ($(DP_LINK_ZLIB), dlopen)
        CFLAGS_LIBZ=
        LIB_Z=
 endif
 
 # jpeg
-ifeq ($(DP_LINK_LIBS), shared)
+ifeq ($(DP_LINK_JPEG), shared)
        CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
        LIB_JPEG=-ljpeg
 endif
-ifeq ($(DP_LINK_LIBS), dlopen)
+ifeq ($(DP_LINK_JPEG), dlopen)
        CFLAGS_LIBJPEG=
        LIB_JPEG=
 endif
 
 # ode
-ifeq ($(DP_LINK_LIBS), shared)
+ifeq ($(DP_LINK_ODE), shared)
        ODE_CONFIG?=ode-config
        LIB_ODE=`$(ODE_CONFIG) --libs`
        CFLAGS_ODE=`$(ODE_CONFIG) --cflags` -DUSEODE -DLINK_TO_LIBODE
 endif
-ifeq ($(DP_LINK_LIBS), dlopen)
+ifeq ($(DP_LINK_ODE), dlopen)
        LIB_ODE=
        CFLAGS_ODE=-DUSEODE
 endif
@@ -284,13 +288,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=
-
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -361,7 +358,7 @@ endif
 
 ##### GNU Make specific definitions #####
 
-DO_LD=$(CC) -o ../../../$@ $^ $(LDFLAGS)
+DO_LD=$(CC) -o $@ $^ $(LDFLAGS)
 
 
 ##### Definitions shared by all makefiles #####