X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=BSDmakefile;h=28106df6c7cff170c0cdc214c122e366a01ffdee;hb=6761895ef563dfb1fa3729c54428e31138b7a58b;hp=23563cd3d29f08a2ac15cd0515a5156183ce6b3d;hpb=1b9b5df66c5f2fce9ce8de22c6b77d3054f4f742;p=xonotic%2Fdarkplaces.git diff --git a/BSDmakefile b/BSDmakefile index 23563cd3..28106df6 100644 --- 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