summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-03-14 12:45:24 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-03-14 12:53:41 +0100
commit2f4d160bd6f4730c1597c11757efffc4173a17bf (patch)
treec57441962dff71aeecd92e12f1cff0f35405b4a8 /RepositoryExternal.mk
parentsafer order of replacement (diff)
downloadcore-2f4d160bd6f4730c1597c11757efffc4173a17bf.tar.gz
core-2f4d160bd6f4730c1597c11757efffc4173a17bf.zip
Libcdr and libvisio need zlib
Change-Id: Ie48c7305e7acca17d3c488a76e8fc47984c51679
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6a15af5c46c6..a7042b127d96 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -298,6 +298,8 @@ define gb_LinkTarget__use_zlib_x64
endef
+gb_ExternalProject__use_zlib :=
+
else # !SYSTEM_ZLIB
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
@@ -333,6 +335,12 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64)
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