diff options
| -rw-r--r-- | Module_tail_build.mk | 1 | ||||
| -rw-r--r-- | jpeg/StaticLibrary_jpeg.mk | 2 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index c62c484f3cd2..4f2c9e2a7f4f 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -89,6 +89,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ io \ javaunohelper \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ + $(call gb_Helper_optional,JPEG,jpeg) \ jurt \ jvmaccess \ jvmfwk \ diff --git a/jpeg/StaticLibrary_jpeg.mk b/jpeg/StaticLibrary_jpeg.mk index 91e3773064ac..d3430bab2734 100644 --- a/jpeg/StaticLibrary_jpeg.mk +++ b/jpeg/StaticLibrary_jpeg.mk @@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,jpeg)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeg)) +$(eval $(call gb_StaticLibrary_use_package,jpeg,jpeg_inc)) + $(eval $(call gb_StaticLibrary_use_unpacked,jpeg,jpeg)) $(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeg,\ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 653adf9a9d76..39c216eeccd9 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL |