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

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 685fb63d29fc8deacdbff8ffbd7dd03b1a5f26dc..064a6e7b99d41c8cd387a8f981cad3ef143048e4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -101,11 +101,13 @@ ifeq ($(DP_MAKE_TARGET), linux)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 

+       DP_LINK_SDL?=shared

        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=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_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen

+       DP_LINK_XMP?=dlopen

 endif
 
 # Mac OS X configuration
 endif
 
 # Mac OS X configuration


@@ -129,11 +131,13 @@ ifeq ($(DP_MAKE_TARGET), macosx)
                CFLAGS_MAKEDEP=
        endif
 
                CFLAGS_MAKEDEP=
        endif
 

+       DP_LINK_SDL?=shared

        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=dlopen
        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_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
 
        # 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)
 
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 

+       DP_LINK_SDL?=shared

        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=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_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen

+       DP_LINK_XMP?=dlopen

 endif
 
 # BSD configuration
 endif
 
 # BSD configuration


@@ -188,11 +194,13 @@ ifeq ($(DP_MAKE_TARGET), bsd)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 

+       DP_LINK_SDL?=shared

        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=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_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen

+       DP_LINK_XMP?=dlopen

 endif
 
 # Win32 configuration
 endif
 
 # Win32 configuration


@@ -213,7 +221,7 @@ ifeq ($(WIN64RELEASE), 1)
 #      WINDRES=$(TARGET)-windres
 endif
 
 #      WINDRES=$(TARGET)-windres
 endif
 

-CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
+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)
 
 
 ifeq ($(DP_MAKE_TARGET), mingw)


@@ -232,15 +240,24 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 
        EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 

+       DP_LINK_SDL?=shared

        DP_LINK_ZLIB?=dlopen
        DP_LINK_JPEG?=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_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen

+       DP_LINK_XMP?=dlopen

 endif
 
 # set these to "" if you want to use dynamic loading instead
 # zlib
 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
 ifeq ($(DP_LINK_ZLIB), shared)
        CFLAGS_LIBZ=-DLINK_TO_ZLIB
        LIB_Z=-lz


@@ -289,9 +306,24 @@ ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen)
        CFLAGS_CRYPTO_RIJNDAEL=
 endif
 
        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 #####
 ##### 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
 ifdef DP_FS_BASEDIR
        CFLAGS_FS=-DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\"
 else