From: Cloudwalk <cloudwalk009@gmail.com>
Date: Wed, 21 Jul 2021 16:08:54 +0000 (-0400)
Subject: ode: Disable by default. Minor memory savings in all edict_ts
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=8a4f0205f0d377eb77a0f045c6ae02a04e6ed671;hp=73f27d62983b6af1cb9a6971d0a4cb6275b91a07

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

diff --git a/BSDmakefile b/BSDmakefile
index 338293fa..b98686dc 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -25,7 +25,7 @@ TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz
 # Link options
 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
diff --git a/makefile b/makefile
index 46aa0107..064a6e7b 100644
--- a/makefile
+++ b/makefile
@@ -104,7 +104,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
 	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
@@ -134,7 +134,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	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
@@ -170,7 +170,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
 	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
@@ -197,7 +197,7 @@ ifeq ($(DP_MAKE_TARGET), bsd)
 	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
@@ -243,7 +243,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	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