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

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index d5bfc55f92275572e4aedb73d89dbfa777f44d95..064a6e7b99d41c8cd387a8f981cad3ef143048e4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -101,9 +101,10 @@ 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
@@ -130,9 +131,10 @@ 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
@@ -165,9 +167,10 @@ 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
@@ -191,9 +194,10 @@ 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
@@ -236,9 +240,10 @@ 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
@@ -246,6 +251,13 @@ 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