Fix setinfo.

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 80ab84b7735c114a653d155b0fdc34305e2b5a27..326e3a4a8da2cdc4158cff6f280d2a84efde2ba0 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -25,20 +25,20 @@ CC?=gcc
 CPUOPTIMIZATIONS?=-fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
 # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag
 
 CPUOPTIMIZATIONS?=-fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
 # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag
 

-SDL_CONFIG?=sdl-config
+SDL_CONFIG?=sdl2-config

 SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags`
 SDLCONFIG_UNIXCFLAGS_X11?=
 SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs`
 SDLCONFIG_UNIXLIBS_X11?=-lX11
 SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs`
 SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11
 SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags`
 SDLCONFIG_UNIXCFLAGS_X11?=
 SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs`
 SDLCONFIG_UNIXLIBS_X11?=-lX11
 SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs`
 SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11

-SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL.framework/Headers -I$(HOME)/Library/Frameworks/SDL.framework/Headers
-SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
-SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
+SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL2.framework/Headers -I$(HOME)/Library/Frameworks/SDL2.framework/Headers
+SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
+SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)

 STRIP?=strip
 
 
 STRIP?=strip
 
 

-###### Sound and audio CD #####
+###### Sound #####

 
 OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
 
 
 OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
 


@@ -70,10 +70,6 @@ LIB_SND_WIN=
 OBJ_SND_3DRAS=snd_3dras.o
 LIB_SND_3DRAS=
 
 OBJ_SND_3DRAS=snd_3dras.o
 LIB_SND_3DRAS=
 

-# CD objects
-OBJ_CD_COMMON=cd_shared.o
-OBJ_NOCD=cd_null.o
-

 
 ###### Common objects and flags #####
 
 
 ###### Common objects and flags #####
 


@@ -81,9 +77,9 @@ OBJ_NOCD=cd_null.o
 OBJ_COMMON= \
        bih.o \
        crypto.o \
 OBJ_COMMON= \
        bih.o \
        crypto.o \

+       cd_shared.o \

        cl_collision.o \
        cl_demo.o \
        cl_collision.o \
        cl_demo.o \

-       cl_dyntexture.o \

        cl_input.o \
        cl_main.o \
        cl_parse.o \
        cl_input.o \
        cl_main.o \
        cl_parse.o \


@@ -98,7 +94,6 @@ OBJ_COMMON= \
        csprogs.o \
        curves.o \
        cvar.o \
        csprogs.o \
        curves.o \
        cvar.o \

-       dpsoftrast.o \

        dpvsimpledecode.o \
        filematch.o \
        fractalnoise.o \
        dpvsimpledecode.o \
        filematch.o \
        fractalnoise.o \


@@ -167,21 +162,26 @@ OBJ_MENU= \
 # being linked, because it should be recompiled every time an executable is
 # built to give the executable a proper date string
 OBJ_SV= builddate.c sys_linux.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON)
 # being linked, because it should be recompiled every time an executable is
 # built to give the executable a proper date string
 OBJ_SV= builddate.c sys_linux.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON)

-OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMMON) snd_sdl.o $(OBJ_SDLCD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
+OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMMON) snd_sdl.o $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)

 
 
 # Compilation
 
 
 # Compilation

-CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
-CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
+CFLAGS_CLIENT=-DCONFIG_MENU $(CFLAGS_VIDEO_CAPTURE)

 CFLAGS_SERVER=
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs
 CFLAGS_RELEASE=
 CFLAGS_RELEASE_PROFILE=-fbranch-probabilities
 CFLAGS_SERVER=
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs
 CFLAGS_RELEASE=
 CFLAGS_RELEASE_PROFILE=-fbranch-probabilities

-CFLAGS_SDL=$(SDLCONFIG_CFLAGS)
+CFLAGS_SDL=

 
 

-CFLAGS_SSE=-msse
-CFLAGS_SSE2=-msse2
+ifeq ($(DP_SSE),1)
+       CFLAGS_SSE=-msse
+       CFLAGS_SSE2=-msse2
+else
+       CFLAGS_SSE=
+       CFLAGS_SSE2=
+endif # ifeq ($(DP_SSE),1)

 
 OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
 #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
 
 OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
 #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)


@@ -202,20 +202,14 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; }
 
 ##### UNIX specific variables #####
 
 
 ##### UNIX specific variables #####
 

-OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
-

 LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
 LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)

-LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND)
-LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl

 LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
 LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
 CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD
 
 LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS)
 LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
 LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
 CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD
 
 LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS)

-EXE_UNIXCL=darkplaces-glx

 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl
 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl

-EXE_UNIXCLNEXUIZ=nexuiz-glx

 EXE_UNIXSVNEXUIZ=nexuiz-dedicated
 EXE_UNIXSDLNEXUIZ=nexuiz-sdl
 
 EXE_UNIXSVNEXUIZ=nexuiz-dedicated
 EXE_UNIXSDLNEXUIZ=nexuiz-sdl
 


@@ -227,36 +221,22 @@ CMD_UNIXMKDIR=mkdir -p
 ##### Linux specific variables #####
 
 # Link
 ##### Linux specific variables #####
 
 # Link

-LDFLAGS_LINUXCL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXCL)

 LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl
 LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXSDL)
 
 
 ##### Mac OS X specific variables #####
 
 LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl
 LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXSDL)
 
 
 ##### Mac OS X specific variables #####
 

-# No CD support available
-OBJ_MACOSXCD=$(OBJ_NOCD)
-

 # Link
 # Link

-LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit -framework Carbon $(LIB_SOUND)

 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
 LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m
 
 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
 LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m
 

-OBJ_AGL= builddate.c sys_linux.o vid_agl.o thread_null.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
-
-EXE_MACOSXCL=darkplaces-agl
-EXE_MACOSXCLNEXUIZ=nexuiz-agl
-

 
 ##### SunOS specific variables #####
 
 
 ##### SunOS specific variables #####
 

-# No CD support available
-OBJ_SUNOSCD=$(OBJ_NOCD)
-

 CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS
 
 # Link
 CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS
 
 # Link

-LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl -R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm $(LIB_SOUND)

 LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl
 LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL)
 
 LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl
 LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL)
 


@@ -264,7 +244,6 @@ LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl $(LDFLAGS_UNIXSD
 ##### BSD specific variables #####
 
 # Link
 ##### BSD specific variables #####
 
 # Link

-LDFLAGS_BSDCL=$(LDFLAGS_UNIXCOMMON) -lutil $(LDFLAGS_UNIXCL)

 LDFLAGS_BSDSV=$(LDFLAGS_UNIXCOMMON) 
 LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL)
 
 LDFLAGS_BSDSV=$(LDFLAGS_UNIXCOMMON) 
 LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL)
 


@@ -273,17 +252,12 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL)
 
 WINDRES ?= windres
 
 
 WINDRES ?= windres
 

-OBJ_WGL= builddate.c sys_win.o vid_wgl.o thread_null.o $(OBJ_MENU) $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
-

 # Link
 # see LDFLAGS_WINCOMMON in makefile
 # Link
 # see LDFLAGS_WINCOMMON in makefile

-LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mwindows -lwinmm -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 -lws2_32 $(LDFLAGS_D3D) $(LIB_Z) $(LIB_JPEG)

 LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mconsole -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG)
 LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(SDLCONFIG_LIBS) -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG)
 LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mconsole -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG)
 LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(SDLCONFIG_LIBS) -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG)

-EXE_WINCL=darkplaces.exe

 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe

-EXE_WINCLNEXUIZ=nexuiz.exe

 EXE_WINSVNEXUIZ=nexuiz-dedicated.exe
 EXE_WINSDLNEXUIZ=nexuiz-sdl.exe
 
 EXE_WINSVNEXUIZ=nexuiz-dedicated.exe
 EXE_WINSDLNEXUIZ=nexuiz-sdl.exe
 


@@ -293,43 +267,37 @@ VPATH := ../../../
 
 .PHONY : clean clean-profile help \
         debug profile release \
 
 .PHONY : clean clean-profile help \
         debug profile release \

-        cl-debug cl-profile cl-release \

         sv-debug sv-profile sv-release \
         sdl-debug sdl-profile sdl-release
 
 help:
        @echo
        @echo "===== Choose one ====="
         sv-debug sv-profile sv-release \
         sdl-debug sdl-profile sdl-release
 
 help:
        @echo
        @echo "===== Choose one ====="

-       @echo "* $(MAKE) clean               : delete all files produced by the build except"
-       @echo "                             profiling information"
-       @echo "* $(MAKE) clean-profile       : delete all files produced by the build, including"
-       @echo "                             profiling informaiton"
-       @echo "* $(MAKE) help                : this help"
-       @echo "* $(MAKE) debug               : make client and server binaries (debug versions)"
-       @echo "* $(MAKE) profile             : make client and server binaries (profile versions)"
-       @echo "* $(MAKE) release             : make client and server binaries (release versions)"
-       @echo "* $(MAKE) release-profile     : make client and server binaries (release versions)"
-       @echo "                             with profileing optomizations) The profiled"
-       @echo "                             version of the program must have been"
-       @echo "                             previously compiled"
-       @echo "* $(MAKE) nexuiz              : make client and server binaries with nexuiz icon"
-       @echo "                             (release versions)"
-       @echo "* $(MAKE) cl-debug            : make client (debug version)"
-       @echo "* $(MAKE) cl-profile          : make client (profile version)"
-       @echo "* $(MAKE) cl-release          : make client (release version)"
-       @echo "* $(MAKE) cl-release-profile  : make client (release version)"
-       @echo "* $(MAKE) cl-nexuiz           : make client with nexuiz icon (release version)"
-       @echo "* $(MAKE) sv-debug            : make dedicated server (debug version)"
-       @echo "* $(MAKE) sv-profile          : make dedicated server (profile version)"
-       @echo "* $(MAKE) sv-release          : make dedicated server (release version)"
-       @echo "* $(MAKE) sv-release-profile  : make dedicated server (release version)"
-       @echo "* $(MAKE) sv-nexuiz           : make dedicated server with nexuiz icon"
-       @echo "                             (release version)"
-       @echo "* $(MAKE) sdl-debug           : make SDL client (debug version)"
-       @echo "* $(MAKE) sdl-profile         : make SDL client (profile version)"
-       @echo "* $(MAKE) sdl-profile-profile : make SDL client (profile version)"
-       @echo "* $(MAKE) sdl-release         : make SDL client (release version)"
-       @echo "* $(MAKE) sdl-nexuiz          : make SDL client with nexuiz icon (release version)"
+       @echo "* $(MAKE) clean                : delete all files produced by the build except"
+       @echo "                              profiling information"
+       @echo "* $(MAKE) clean-profile        : delete all files produced by the build, including"
+       @echo "                              profiling informaiton"
+       @echo "* $(MAKE) help                 : this help"
+       @echo "* $(MAKE) debug                : make client and server binaries (debug versions)"
+       @echo "* $(MAKE) profile              : make client and server binaries (profile versions)"
+       @echo "* $(MAKE) release              : make client and server binaries (release versions)"
+       @echo "* $(MAKE) release-profile      : make client and server binaries (release versions)"
+       @echo "                              (with profiling optimizations) The profiled"
+       @echo "                              version of the program must have been"
+       @echo "                              previously compiled"
+       @echo "* $(MAKE) nexuiz               : make client and server binaries with nexuiz icon"
+       @echo "                              (release versions)"
+       @echo "* $(MAKE) sv-debug             : make dedicated server (debug version)"
+       @echo "* $(MAKE) sv-profile           : make dedicated server (profile version)"
+       @echo "* $(MAKE) sv-release-profile   : make dedicated server (release profile version)"
+       @echo "* $(MAKE) sv-release           : make dedicated server (release version)"
+       @echo "* $(MAKE) sv-nexuiz            : make dedicated server with nexuiz icon"
+       @echo "                              (release version)"
+       @echo "* $(MAKE) sdl-debug            : make SDL client (debug version)"
+       @echo "* $(MAKE) sdl-profile          : make SDL client (profile version)"
+       @echo "* $(MAKE) sdl-release-profile  : make SDL client (release version)"
+       @echo "* $(MAKE) sdl-release          : make SDL client (release version)"
+       @echo "* $(MAKE) sdl-nexuiz           : make SDL client with nexuiz icon (release version)"

        @echo
 
 debug :
        @echo
 
 debug :


@@ -347,88 +315,63 @@ release-profile :
 nexuiz :
        $(MAKE) $(TARGETS_NEXUIZ)
 
 nexuiz :
        $(MAKE) $(TARGETS_NEXUIZ)
 

-cl-debug :
-       $(MAKE) bin-debug \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1
-
-cl-profile :
-       $(MAKE) bin-profile \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1
-
-cl-release :
-       $(MAKE) bin-release \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1
-
-cl-release-profile :
-       $(MAKE) bin-release-profile \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1
-
-cl-nexuiz :
-       $(MAKE) bin-release \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_CLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1
-

 sv-debug :
        $(MAKE) bin-debug \
 sv-debug :
        $(MAKE) bin-debug \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-profile :
        $(MAKE) bin-profile \
                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-profile :
        $(MAKE) bin-profile \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-release :
        $(MAKE) bin-release \
                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-release :
        $(MAKE) bin-release \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-release-profile :
        $(MAKE) bin-release-profile \
                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-release-profile :
        $(MAKE) bin-release-profile \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-nexuiz :
        $(MAKE) bin-release \
                EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
 
 sv-nexuiz :
        $(MAKE) bin-release \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_SVNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+               EXE='$(EXE_SVNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1

 
 sdl-debug :
        $(MAKE) bin-debug \
 
 sdl-debug :
        $(MAKE) bin-debug \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1

 
 sdl-profile :
        $(MAKE) bin-profile \
 
 sdl-profile :
        $(MAKE) bin-profile \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1

 
 sdl-release :
        $(MAKE) bin-release \
 
 sdl-release :
        $(MAKE) bin-release \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1

 
 sdl-release-profile :
        $(MAKE) bin-release-profile \
 
 sdl-release-profile :
        $(MAKE) bin-release-profile \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+               EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1

 
 sdl-nexuiz :
        $(MAKE) bin-release \
 
 sdl-nexuiz :
        $(MAKE) bin-release \

-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
-               EXE='$(EXE_SDLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+               EXE='$(EXE_SDLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1

 
 bin-debug :
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (debug) =========='
 
 bin-debug :
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (debug) =========='

-       $(MAKE) prepare BUILD_DIR=obj/debug/$(EXE)
-       $(MAKE) -C obj/debug/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+       $(MAKE) prepare BUILD_DIR=build-obj/debug/$(EXE)
+       $(MAKE) -C build-obj/debug/$(EXE) $(EXE) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)'\
                LDFLAGS='$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)' LEVEL=2
 
                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)'\
                LDFLAGS='$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)' LEVEL=2
 


@@ -436,9 +379,9 @@ bin-profile :
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (profile) =========='
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (profile) =========='

-       $(MAKE) prepare BUILD_DIR=obj/profile/$(EXE)
-       $(MAKE) -C obj/profile/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+       $(MAKE) prepare BUILD_DIR=build-obj/profile/$(EXE)
+       $(MAKE) -C build-obj/profile/$(EXE) $(EXE) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)'\
                LDFLAGS='$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)' LEVEL=2
 
                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)'\
                LDFLAGS='$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)' LEVEL=2
 


@@ -446,9 +389,9 @@ bin-release :
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (release) =========='
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (release) =========='

-       $(MAKE) prepare BUILD_DIR=obj/release/$(EXE)
-       $(MAKE) -C obj/release/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+       $(MAKE) prepare BUILD_DIR=build-obj/release/$(EXE)
+       $(MAKE) -C build-obj/release/$(EXE) $(EXE) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)'\
                LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2
        $(STRIP) $(EXE)
                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)'\
                LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2
        $(STRIP) $(EXE)


@@ -457,9 +400,9 @@ bin-release-profile :
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (release) =========='
        $(CHECKLEVEL1)
        @echo
        @echo '========== $(EXE) (release) =========='

-       $(MAKE) prepare BUILD_DIR=obj/release-profile/$(EXE)
-       $(MAKE) -C obj/release-profile/$(EXE) -f ../../../$(MAKEFILE) $(EXE) \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+       $(MAKE) prepare BUILD_DIR=build-obj/release-profile/$(EXE)
+       $(MAKE) -C build-obj/release-profile/$(EXE) $(EXE) \
+               DP_MAKE_TARGET=$(DP_MAKE_TARGET) \

                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE_PROFILE) $(OPTIM_RELEASE)'\
                LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2
        $(STRIP) $(EXE)
                CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE_PROFILE) $(OPTIM_RELEASE)'\
                LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2
        $(STRIP) $(EXE)


@@ -467,6 +410,7 @@ bin-release-profile :
 prepare :
        $(CMD_MKDIR) $(BUILD_DIR)
        $(CMD_CP) makefile.inc $(BUILD_DIR)/
 prepare :
        $(CMD_MKDIR) $(BUILD_DIR)
        $(CMD_CP) makefile.inc $(BUILD_DIR)/

+       $(CMD_CP) $(MAKEFILE) $(BUILD_DIR)/

 
 #this checks USEODE when compiling so it needs the ODE flags as well
 prvm_cmds.o: prvm_cmds.c
 
 #this checks USEODE when compiling so it needs the ODE flags as well
 prvm_cmds.o: prvm_cmds.c


@@ -485,30 +429,6 @@ keysym2ucs.o: keysym2ucs.c
        $(CHECKLEVEL2)
        $(DO_CC) -I/usr/X11R6/include
 
        $(CHECKLEVEL2)
        $(DO_CC) -I/usr/X11R6/include
 

-vid_sdl.o: vid_sdl.c
-       $(CHECKLEVEL2)
-       $(DO_CC) $(CFLAGS_SDL)
-
-sys_sdl.o: sys_sdl.c
-       $(CHECKLEVEL2)
-       $(DO_CC) $(CFLAGS_SDL)
-
-snd_sdl.o: snd_sdl.c
-       $(CHECKLEVEL2)
-       $(DO_CC) $(CFLAGS_SDL)
-
-thread_sdl.o: thread_sdl.c
-       $(CHECKLEVEL2)
-       $(DO_CC) $(CFLAGS_SDL)
-
-snd_3dras.o: snd_3dras.c
-       $(CHECKLEVEL2)
-       $(DO_CC)
-
-cd_sdl.o: cd_sdl.c
-       $(CHECKLEVEL2)
-       $(DO_CC) $(CFLAGS_SDL)
-

 crypto.o: crypto.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_CRYPTO) $(CFLAGS_CRYPTO_RIJNDAEL)
 crypto.o: crypto.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_CRYPTO) $(CFLAGS_CRYPTO_RIJNDAEL)


@@ -517,10 +437,6 @@ mod_skeletal_animatevertices_sse.o: mod_skeletal_animatevertices_sse.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_SSE)
 
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_SSE)
 

-dpsoftrast.o: dpsoftrast.c
-       $(CHECKLEVEL2)
-       $(DO_CC) $(CFLAGS_SSE2)
-

 darkplaces.o: %.o : %.rc
        $(CHECKLEVEL2)
        $(WINDRES) -o $@ $<
 darkplaces.o: %.o : %.rc
        $(CHECKLEVEL2)
        $(WINDRES) -o $@ $<


@@ -533,10 +449,6 @@ nexuiz.o: %.o : %.rc
        $(CHECKLEVEL2)
        $(DO_CC)
 
        $(CHECKLEVEL2)
        $(DO_CC)
 

-$(EXE_CL): $(OBJ_CL) $(OBJ_ICON)
-       $(CHECKLEVEL2)
-       $(DO_LD)
-

 $(EXE_SV): $(OBJ_SV) $(OBJ_ICON)
        $(CHECKLEVEL2)
        $(DO_LD)
 $(EXE_SV): $(OBJ_SV) $(OBJ_ICON)
        $(CHECKLEVEL2)
        $(DO_LD)


@@ -545,10 +457,6 @@ $(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON)
        $(CHECKLEVEL2)
        $(DO_LD)
 
        $(CHECKLEVEL2)
        $(DO_LD)
 

-$(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ)
-       $(CHECKLEVEL2)
-       $(DO_LD)
-

 $(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)
        $(CHECKLEVEL2)
        $(DO_LD)
 $(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)
        $(CHECKLEVEL2)
        $(DO_LD)


@@ -558,15 +466,13 @@ $(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
        $(DO_LD)
 
 clean:
        $(DO_LD)
 
 clean:

-       -$(CMD_RM) $(EXE_CL)

        -$(CMD_RM) $(EXE_SV)
        -$(CMD_RM) $(EXE_SDL)
        -$(CMD_RM) $(EXE_SV)
        -$(CMD_RM) $(EXE_SDL)

-       -$(CMD_RM) $(EXE_CLNEXUIZ)

        -$(CMD_RM) $(EXE_SVNEXUIZ)
        -$(CMD_RM) $(EXE_SDLNEXUIZ)
        -$(CMD_RM) *.o
        -$(CMD_RM) *.d
        -$(CMD_RM) $(EXE_SVNEXUIZ)
        -$(CMD_RM) $(EXE_SDLNEXUIZ)
        -$(CMD_RM) *.o
        -$(CMD_RM) *.d

-       -$(CMD_RM) obj/
+       -$(CMD_RM) build-obj/

 
 clean-profile: clean
        -$(CMD_RM) *.gcda
 
 clean-profile: clean
        -$(CMD_RM) *.gcda