diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-12 09:15:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-12 13:44:59 +0200 |
| commit | 4e943da402ea5a7b450a9251ff75a6a3969dba74 (patch) | |
| tree | 33216ab0d686168cb3825ccccfefeb47f2779f5b /external/pdfium/Library_pdfium.mk | |
| parent | c4d02f488d6ca85e25f231db27eaba4ca3085db0 (diff) | |
external: upgrade to pdfium-3050 and stop using bundled zlib
Change-Id: I2e572585ea1cebc65aa364d8ce059cf0a3e1b83f
Reviewed-on: https://gerrit.libreoffice.org/36443
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external/pdfium/Library_pdfium.mk')
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 79f8917c61c8..e8f2a9e9b481 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -250,7 +250,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ # fpdfdoc $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfdoc/cline \ - UnpackedTarball/pdfium/core/fpdfdoc/clines \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_aaction \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_action \ UnpackedTarball/pdfium/core/fpdfdoc/cpdf_actionfields \ @@ -417,7 +416,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_SpecialButton \ UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_Utils \ UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_Wnd \ - UnpackedTarball/pdfium/fpdfsdk/pdfwindow/cpwl_pathdata \ + UnpackedTarball/pdfium/fpdfsdk/pdfwindow/cpwl_color \ )) # third_party/bigint @@ -489,27 +488,11 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\ UnpackedTarball/pdfium/third_party/libopenjpeg20/tgt \ )) -# third_party/fx_zlib -$(eval $(call gb_Library_add_generated_cobjects,pdfium,\ - UnpackedTarball/pdfium/third_party/zlib_v128/adler32 \ - UnpackedTarball/pdfium/third_party/zlib_v128/compress \ - UnpackedTarball/pdfium/third_party/zlib_v128/crc32 \ - UnpackedTarball/pdfium/third_party/zlib_v128/deflate \ - UnpackedTarball/pdfium/third_party/zlib_v128/gzclose \ - UnpackedTarball/pdfium/third_party/zlib_v128/gzlib \ - UnpackedTarball/pdfium/third_party/zlib_v128/gzread \ - UnpackedTarball/pdfium/third_party/zlib_v128/gzwrite \ - UnpackedTarball/pdfium/third_party/zlib_v128/infback \ - UnpackedTarball/pdfium/third_party/zlib_v128/inffast \ - UnpackedTarball/pdfium/third_party/zlib_v128/inflate \ - UnpackedTarball/pdfium/third_party/zlib_v128/inftrees \ - UnpackedTarball/pdfium/third_party/zlib_v128/trees \ - UnpackedTarball/pdfium/third_party/zlib_v128/uncompr \ - UnpackedTarball/pdfium/third_party/zlib_v128/zutil \ +$(eval $(call gb_Library_use_externals,pdfium,\ + jpeg \ + zlib \ )) -$(eval $(call gb_Library_use_external,pdfium,jpeg)) - ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,pdfium,\ -ldl \ |