diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-06-08 17:44:56 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-06-08 18:53:32 +0200 |
| commit | 98cfc7db5ed352b2ddb9a547c7f88abb83264cef (patch) | |
| tree | 4cad6c59340e0cbc5cf6f0bb07c5603c323f1052 /external | |
| parent | ea5a0918c8c32309821ab239c4b95f4d6a3b5c12 (diff) | |
libtiff WASM: add Emscripten flags to fix NEH build
Change-Id: I3ea1ca064cdddee1bea6b5816f63f0e4a93217de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135505
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libtiff/ExternalProject_libtiff.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/libtiff/ExternalProject_libtiff.mk b/external/libtiff/ExternalProject_libtiff.mk index 04af18322541..e318126dcfe0 100644 --- a/external/libtiff/ExternalProject_libtiff.mk +++ b/external/libtiff/ExternalProject_libtiff.mk @@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) : --with-pic \ --without-x \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,libtiff)" \ + CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,libtiff) $(gb_EMSCRIPTEN_CFLAGS)" \ $(if $(SYSTEM_ZLIB),,--with-zlib-include-dir="$(call gb_UnpackedTarball_get_dir,zlib)") \ $(if $(SYSTEM_ZLIB),,--with-zlib-lib-dir="$(gb_StaticLibrary_WORKDIR)") \ $(if $(SYSTEM_LIBJPEG),,--with-jpeg-include-dir="$(call gb_UnpackedTarball_get_dir,libjpeg-turbo)") \ @@ -59,8 +59,8 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) : $(if $(SYSTEM_LIBWEBP),,$(if $(filter WNT,$(OS_FOR_BUILD)),\ --with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT)", \ --with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs")) \ - CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ - LDFLAGS="$(call gb_ExternalProject_get_link_flags,libtiff)" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS)" \ + LDFLAGS="$(call gb_ExternalProject_get_link_flags,libtiff) $(gb_EMSCRIPTEN_LDFLAGS)" \ ac_cv_lib_z_inflateEnd=yes \ ac_cv_lib_jpeg_jpeg_read_scanlines=yes \ ac_cv_lib_webp_WebPDecode=yes \ |