diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-17 09:16:34 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-17 14:47:57 +0100 |
| commit | 71fae5db27255fb51a25a307205a8fe76cc56b6a (patch) | |
| tree | cec2164a8b885870975e75d367447dba56f5cdd4 /external/Module_external.mk | |
| parent | 65f41639e219470c80f896129731f9ed6f072b6b (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 'external/Module_external.mk')
| -rw-r--r-- | external/Module_external.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index 688e33503e53..6d38fd583939 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,ICU,icu) \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,JPEG,jpeg) \ + $(call gb_Helper_optional,JPEG_TURBO,jpeg-turbo) \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ |