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 /config_host.mk.in | |
| 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 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index b507562b034d..a23629f05098 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -411,6 +411,7 @@ export MWAW_CFLAGS=$(gb_SPACE)@MWAW_CFLAGS@ export MWAW_LIBS=$(gb_SPACE)@MWAW_LIBS@ export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@ export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@ +export NASM=@NASM@ export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@ export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@ export NEON_VERSION=@NEON_VERSION@ @@ -619,6 +620,7 @@ export WITH_FONTS=@WITH_FONTS@ export WITH_GALLERY_BUILD=@WITH_GALLERY_BUILD@ export WITH_GSSAPI=@WITH_GSSAPI@ export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@ +export WITH_JPEG_TURBO=@WITH_JPEG_TURBO@ export WITH_KRB5=@WITH_KRB5@ export WITH_LANG=@WITH_LANG@ export WITH_LANG_LIST=@WITH_LANG_LIST@ |