Skip to content

C
core
Kaydet (Commit) 2f4d160b authored tarafından Fridrich Štrba's avatar Fridrich Štrba
Dosyalara gözat
Seçenekler

Libcdr and libvisio need zlib 

Change-Id: Ie48c7305e7acca17d3c488a76e8fc47984c51679
üst 18c1fa36
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 2f4d160b
...@@ -298,6 +298,8 @@ define gb_LinkTarget__use_zlib_x64 ...@@ -298,6 +298,8 @@ define gb_LinkTarget__use_zlib_x64
endef endef
gb_ExternalProject__use_zlib :=
else # !SYSTEM_ZLIB else # !SYSTEM_ZLIB
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
...@@ -333,6 +335,12 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64) ...@@ -333,6 +335,12 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64)
endef endef
define gb_ExternalProject__use_zlib
$(call gb_ExternalProject_use_package,$(1),zlib_inc)
$(call gb_ExternalProject_use_static_libraries,$(1),zlib)
endef
endif # SYSTEM_ZLIB endif # SYSTEM_ZLIB
......
libcdr/ExternalProject_libcdr.mk
Dosyayı görüntüle @ 2f4d160b
...@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ ...@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
lcms2 \ lcms2 \
wpd \ wpd \
wpg \ wpg \
zlib \
)) ))
ifeq ($(OS)$(COM),WNTMSC) ifeq ($(OS)$(COM),WNTMSC)
......
libvisio/ExternalProject_libvisio.mk
Dosyayı görüntüle @ 2f4d160b
...@@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ ...@@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
wpd \ wpd \
wpg \ wpg \
libxml2 \ libxml2 \
zlib \
)) ))
$(call gb_ExternalProject_get_state_target,libvisio,build) : $(call gb_ExternalProject_get_state_target,libvisio,build) :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment