X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile;h=4112001b6370f745356c7d1a0303c3f3c81eeeec;hb=c1badb6b99e85cc6fe4abbc4390bc6989c606c2b;hp=5c95d05523348b250e2fc4c1c8ebd4fdde94996e;hpb=f14470cac73d0fc2101dfb375e24fbcec871908c;p=xonotic%2Fdarkplaces.git diff --git a/makefile b/makefile index 5c95d055..4112001b 100644 --- a/makefile +++ b/makefile @@ -232,7 +232,7 @@ endif ##### Extra CFLAGS ##### -CFLAGS_MAKEDEP?=-MD +CFLAGS_MAKEDEP?=-MMD ifdef DP_FS_BASEDIR CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"' else @@ -251,6 +251,14 @@ 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)