X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=064a6e7b99d41c8cd387a8f981cad3ef143048e4;hp=d5bfc55f92275572e4aedb73d89dbfa777f44d95;hb=0207a10e1576d5ebe67730b5b98709383613f4df;hpb=a7726c6a8b24d8c54352358b965e16938b178ce0

diff --git a/makefile b/makefile
index d5bfc55f..064a6e7b 100644
--- 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