diff options
| author | Rene Engelhard <rene@rene-engelhard.de> | 2021-11-19 16:36:22 +0100 |
|---|---|---|
| committer | René Engelhard <rene@debian.org> | 2021-11-19 22:23:42 +0100 |
| commit | 214fa233338c09156c67f85818b6a2ea6b3235bd (patch) | |
| tree | f1ff76f48f834aee3c5d0c3c976fa0140ee654a7 /external | |
| parent | 04c5aef876dc4dbeff96f772254b6a7edb6d8433 (diff) | |
add with-system-abseil/with-system-openjpeg for pdfium
Change-Id: I270cbb75cde2a44416b61978b8eefdf267720031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125559
Tested-by: Jenkins
Reviewed-by: René Engelhard <rene@debian.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index ee2917fbfd5d..fd355a026b5a 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -19,7 +19,8 @@ $(eval $(call gb_Library_set_include,pdfium,\ -I$(call gb_UnpackedTarball_get_dir,pdfium) \ -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party \ -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/agg23 \ - -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/abseil-cpp \ + $(if $(filter TRUE,$(SYSTEM_ABSEIL)),$(ABSEIL_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/abseil-cpp) \ + $(if $(filter TRUE,$(SYSTEM_OPENJPEG2)),$(OPENJPEG2_CFLAGS)) \ $$(INCLUDE) \ )) @@ -34,6 +35,12 @@ $(eval $(call gb_Library_add_defs,pdfium,\ -DWIN32_LEAN_AND_MEAN \ -DCOMPONENT_BUILD \ )) +ifeq ($(SYSTEM_OPENJPEG2),TRUE) +$(eval $(call gb_Library_add_defs,pdfium,\ + -DUSE_SYSTEM_LIBOPENJPEG2 \ +)) +endif + $(eval $(call gb_Library_set_generated_cxx_suffix,pdfium,cpp)) @@ -518,11 +525,14 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/third_party/agg23/agg_vcgen_stroke \ )) +ifneq ($(SYSTEM_ABSEIL),TRUE) # third_party/abseil-cpp $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/third_party/abseil-cpp/absl/types/bad_optional_access \ )) +endif +ifneq ($(SYSTEM_OPENJPEG2),TRUE) # third_party/fx_libopenjpeg $(eval $(call gb_Library_add_generated_cobjects,pdfium,\ UnpackedTarball/pdfium/third_party/libopenjpeg20/bio \ @@ -550,6 +560,7 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/third_party/libopenjpeg20/opj_malloc \ )) +endif # pdfium_base $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ @@ -586,6 +597,18 @@ $(eval $(call gb_Library_add_libs,pdfium,\ -lrt \ )) +ifeq ($(SYSTEM_OPENJPEG2),TRUE) +$(eval $(call gb_Library_add_libs,pdfium,\ + $(OPENJPEG2_LIBS) \ +)) +endif + +ifeq ($(SYSTEM_ABSEIL),TRUE) +$(eval $(call gb_Library_add_libs,pdfium,\ + $(ABSEIL_LIBS) \ +)) +endif + $(eval $(call gb_Library_use_external,pdfium,freetype)) $(eval $(call gb_Library_add_defs,pdfium,\ -DDEFINE_PS_TABLES_DATA \ |