X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=BSDmakefile;h=24012acb4743f5d8e7e6b1a33a3d4973b8da4cbb;hb=615c9db8a46177062894d229cd7afd5bd975f760;hp=6514487ef9a43741712a230e9c88ddee520bf731;hpb=3a466b8a6397138a30c965e4a7f75e181d6f0181;p=xonotic%2Fdarkplaces.git

diff --git a/BSDmakefile b/BSDmakefile
index 6514487e..24012acb 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -31,6 +31,10 @@ LDFLAGS_CL=$(LDFLAGS_BSDCL)
 LDFLAGS_SV=$(LDFLAGS_BSDSV)
 LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
+SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 EXE_CL=$(EXE_UNIXCL)
 EXE_SV=$(EXE_UNIXSV)
 EXE_SDL=$(EXE_UNIXSDL)
@@ -83,6 +87,14 @@ 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 #####
 
@@ -93,11 +105,3 @@ DO_LD=$(CC) -o $@ $> $(LDFLAGS)
 
 ##### Definitions shared by all makefiles #####
 .include "makefile.inc"
-
-
-##### Dependency files #####
-
-DEPEND_FILES != ls *.d
-.for i in $(DEPEND_FILES)
-.	include "$i"
-.endfor