From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 20 Aug 2010 12:30:43 +0000 (+0000)
Subject: remove DP_LINK_TO_JPEG from makefile, as this is default now
X-Git-Tag: xonotic-v0.1.0preview~273
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e7a4ae142c3ef9546a3f1293638a700f99a5394;p=xonotic%2Fdarkplaces.git

remove DP_LINK_TO_JPEG from makefile, as this is default now

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10408 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1af047cda084ba4eef3a77271f3d32957a06eb66
---

diff --git a/makefile b/makefile
index 8a5bda68..43b062be 100644
--- a/makefile
+++ b/makefile
@@ -278,14 +278,6 @@ ifdef DP_PRELOAD_DEPENDENCIES
 endif
 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
-
 ##### GNU Make specific definitions #####
 
 DO_LD=$(CC) -o $@ $^ $(LDFLAGS)