funny feature: cl_lerpexcess

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index 24012acb4743f5d8e7e6b1a33a3d4973b8da4cbb..28106df6c7cff170c0cdc214c122e366a01ffdee 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -31,9 +31,9 @@ LDFLAGS_CL=$(LDFLAGS_BSDCL)
 LDFLAGS_SV=$(LDFLAGS_BSDSV)
 LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
-SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
-SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
-SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11)
+SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
+SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
 
 EXE_CL=$(EXE_UNIXCL)
 EXE_SV=$(EXE_UNIXSV)
@@ -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 #####