New command 'history' and new shortcuts to search through the commands history

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index 23563cd3d29f08a2ac15cd0515a5156183ce6b3d..5c7e050ff539209892f34290c042ff6f61880936 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)
@@ -87,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 #####