ode: Disable by default. Minor memory savings in all edict_ts

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index d7f3e6d273cb176e06572ca7850fc9cd748e1fe8..064a6e7b99d41c8cd387a8f981cad3ef143048e4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -78,7 +78,7 @@ TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz
 DP_VIDEO_CAPTURE?=enabled
 ifeq ($(DP_VIDEO_CAPTURE), enabled)
        CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE
-       OBJ_VIDEO_CAPTURE= cap_avi.o cap_ogg.o
+       OBJ_VIDEO_CAPTURE=cap_avi.o cap_ogg.o
 else
        CFLAGS_VIDEO_CAPTURE=
        OBJ_VIDEO_CAPTURE=
@@ -101,11 +101,13 @@ ifeq ($(DP_MAKE_TARGET), linux)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=shared
-       DP_LINK_ODE?=dlopen
+       DP_LINK_ODE?=
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # Mac OS X configuration
@@ -129,11 +131,13 @@ ifeq ($(DP_MAKE_TARGET), macosx)
                CFLAGS_MAKEDEP=
        endif
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=dlopen
-       DP_LINK_ODE?=dlopen
+       DP_LINK_ODE?=
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 
        # on OS X, we don't build the CL by default because it uses deprecated
        # and not-implemented-in-64bit Carbon
@@ -163,11 +167,13 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=shared
-       DP_LINK_ODE?=dlopen
+       DP_LINK_ODE?=
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # BSD configuration
@@ -188,11 +194,13 @@ ifeq ($(DP_MAKE_TARGET), bsd)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=shared
-       DP_LINK_ODE?=dlopen
+       DP_LINK_ODE?=
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # Win32 configuration
@@ -200,7 +208,7 @@ ifeq ($(WIN32RELEASE), 1)
 #      TARGET=i686-pc-mingw32
 #      CC=$(TARGET)-g++
 #      WINDRES=$(TARGET)-windres
-       CPUOPTIMIZATIONS=-march=pentium3 -mfpmath=sse -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
+       CPUOPTIMIZATIONS=-march=pentium3 -mfpmath=sse -fno-math-errno -fno-rounding-math -fno-signaling-nans -fno-trapping-math
 #       CPUOPTIMIZATIONS+=-DUSE_WSPIAPI_H -DSUPPORTIPV6
        LDFLAGS_WINCOMMON=-Wl,--large-address-aware
 else
@@ -213,9 +221,7 @@ ifeq ($(WIN64RELEASE), 1)
 #      WINDRES=$(TARGET)-windres
 endif
 
-CFLAGS_D3D=
-CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
-LDFLAGS_D3D=
+CFLAGS_WARNINGS=-Wall -Winline -Werror=c++-compat -Wwrite-strings -Wshadow -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
 
 
 ifeq ($(DP_MAKE_TARGET), mingw)
@@ -234,15 +240,24 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=dlopen
        DP_LINK_JPEG?=shared
-       DP_LINK_ODE?=dlopen
+       DP_LINK_ODE?=
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # set these to "" if you want to use dynamic loading instead
 # zlib
+ifeq ($(DP_LINK_SDL), shared)
+       SDL_LIBS=$(SDLCONFIG_LIBS)
+endif
+ifeq ($(DP_LINK_SDL), static)
+       SDL_LIBS=$(SDLCONFIG_STATICLIBS)
+endif
+
 ifeq ($(DP_LINK_ZLIB), shared)
        CFLAGS_LIBZ=-DLINK_TO_ZLIB
        LIB_Z=-lz
@@ -291,9 +306,24 @@ ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen)
        CFLAGS_CRYPTO_RIJNDAEL=
 endif
 
+# xmp
+ifeq ($(DP_LINK_XMP), shared)
+       OBJ_SND_XMP=snd_xmp.o
+       LIB_SND_XMP=-lxmp
+       CFLAGS_SND_XMP=-DUSEXMP -DLINK_TO_LIBXMP
+endif
+ifeq ($(DP_LINK_XMP), dlopen)
+       OBJ_SND_XMP=snd_xmp.o
+       LIB_SND_XMP=
+       CFLAGS_SND_XMP=-DUSEXMP
+endif
+
+
 ##### Extra CFLAGS #####
+ifneq ($(CC), tcc)
+       CFLAGS_MAKEDEP?=-MMD
+endif
 
-CFLAGS_MAKEDEP?=-MMD
 ifdef DP_FS_BASEDIR
        CFLAGS_FS=-DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\"
 else