]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
remove DP_LINK_TO_JPEG from makefile, as this is default now
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 20 Aug 2010 12:30:43 +0000 (12:30 +0000)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:25:31 +0000 (14:25 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10408 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1af047cda084ba4eef3a77271f3d32957a06eb66

makefile

index 8a5bda683833ec8bb6ce2f225ca5f9ba09f113ae..43b062be296e37f806d644c93878ca3a769f9ad2 100644 (file)
--- 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)