summaryrefslogtreecommitdiff
path: root/Makefile.fetch
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-11-17 09:16:34 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-11-17 14:47:57 +0100
commit71fae5db27255fb51a25a307205a8fe76cc56b6a (patch)
treecec2164a8b885870975e75d367447dba56f5cdd4 /Makefile.fetch
parent65f41639e219470c80f896129731f9ed6f072b6b (diff)
Add internal libjpeg-turbo library to be used instead of libjpeg
Unfortunately requires nasm - the netwide assembler - http://www.nasm.us/ Upstream libjpeg-turbo is meant to be built with CMake on Windows but thanks to our gcc-wrappers we are able to avoid that. jpeg is kept mostly for platforms we are cross-compiling to. For now, it's used also for Mac OS X because jpeg-turbo does not build there, which should be fixed later. Change-Id: Id87b7072a8acc2578c3abf7e82cb1499e5094dbf
Diffstat (limited to 'Makefile.fetch')
-rw-r--r--Makefile.fetch1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.fetch b/Makefile.fetch
index 18b12be72b30..7aee66a1435e 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -151,6 +151,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \
$(call fetch_Optional,JPEG,JPEG_TARBALL) \
+ $(call fetch_Optional,JPEG_TURBO,JPEG_TURBO_TARBALL) \
$(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \