From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 1 May 2014 01:50:34 +0000 (+0000)
Subject: changed macosx default LINK_LIB_JPEG from shared to dlopen as we still distribute... 
X-Git-Tag: xonotic-v0.8.0~72
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e5f3ee300ed2e44bfc90c2e9df61b3f7e26f908;p=xonotic%2Fdarkplaces.git

changed macosx default LINK_LIB_JPEG from shared to dlopen as we still distribute the jpeg62 version with it

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12065 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=7f727de1f30b85b7f12a347b46a6537b572d3864
---

diff --git a/makefile b/makefile
index 21990599..e3887806 100644
--- a/makefile
+++ b/makefile
@@ -143,7 +143,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	endif
 
 	DP_LINK_ZLIB?=shared
-	DP_LINK_JPEG?=shared
+	DP_LINK_JPEG?=dlopen
 	DP_LINK_ODE?=dlopen
 	DP_LINK_CRYPTO?=dlopen
 	DP_LINK_CRYPTO_RIJNDAEL?=dlopen