From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 21 Jan 2011 06:02:20 +0000 (+0000)
Subject: sync libjpeg support from makefile to BSDmakefile
X-Git-Tag: xonotic-v0.5.0~438^2~127
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=97cda4b5ece4358bc99c7e6ddaa99e7fcc4c5e19;p=xonotic%2Fdarkplaces.git

sync libjpeg support from makefile to BSDmakefile

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10714 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/BSDmakefile b/BSDmakefile
index 5c7e050f..28106df6 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -42,6 +42,10 @@ EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
 EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
 EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
+# libjpeg dependency (set these to "" if you want to use dynamic loading instead)
+CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+LIB_JPEG=-ljpeg
+
 .endif
 
 
@@ -87,14 +91,6 @@ LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD)
 CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
 .endif
 
-.ifdef DP_LINK_TO_LIBJPEG
-LDFLAGS_LIBJPEG?=-ljpeg
-LDFLAGS_CL+=$(LDFLAGS_LIBJPEG)
-LDFLAGS_SV+=$(LDFLAGS_LIBJPEG)
-LDFLAGS_SDL+=$(LDFLAGS_LIBJPEG)
-CFLAGS_PRELOAD+=$(CFLAGS_LIBJPEG) -DLINK_TO_LIBJPEG
-.endif
-
 
 ##### BSD Make specific definitions #####