diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-16 11:07:44 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-16 13:14:54 +0000 |
| commit | 665f58590e7cf8778f80dfb211164b3169a0b7d3 (patch) | |
| tree | 60538790086038fb09bc404e7be231920b8a6206 /external | |
| parent | 0ea920eeb35bd3b454a4ca0e0d94ba36be400b98 (diff) | |
make pdfium link against the same jpeg lib as everything else
Change-Id: I41b3759b427e34d44b3b9481cbfe79be5639a343
Reviewed-on: https://gerrit.libreoffice.org/35264
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'external')
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 842fcc85c9a1..79f8917c61c8 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,pdfium,\ $(eval $(call gb_Library_add_defs,pdfium,\ -DPDFIUM_DLLIMPLEMENTATION \ + -DUSE_SYSTEM_LIBJPEG \ )) # Don't show warnings upstream doesn't care about. @@ -507,49 +508,7 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\ UnpackedTarball/pdfium/third_party/zlib_v128/zutil \ )) -# third_party/jpeg -$(eval $(call gb_Library_add_generated_cobjects,pdfium,\ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcapimin \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcapistd \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jccoefct \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jccolor \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcdctmgr \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jchuff \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcinit \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcmainct \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcmarker \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcmaster \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcomapi \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcparam \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcphuff \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcprepct \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jcsample \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jctrans \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdapimin \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdapistd \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdcoefct \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdcolor \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jddctmgr \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdhuff \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdinput \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdmainct \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdmarker \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdmaster \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdmerge \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdphuff \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdpostct \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdsample \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jdtrans \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jerror \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jfdctfst \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jfdctint \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jidctfst \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jidctint \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jidctred \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jmemmgr \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jmemnobs \ - UnpackedTarball/pdfium/third_party/libjpeg/fpdfapi_jutils \ -)) +$(eval $(call gb_Library_use_external,pdfium,jpeg)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,pdfium,\ |