summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-11-02 22:28:29 +0200
committerTor Lillqvist <tml@collabora.com>2015-11-19 14:05:27 +0200
commit0dd67234ea4ec3913f23b5de1a2020d868f61cdb (patch)
treeaf2df68920f7e24bf8dc7632a3aa96e67ce9fbc2
parentabbf317d3b987f7dcf0f7988fef59a64d9751597 (diff)
We (unintentionally?) build a static archive with MSVC
Change-Id: Ief0ccec4b63e2ac767285f4c19175fa000eaad6c
-rw-r--r--external/glyphy/ExternalPackage_glyphy.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/external/glyphy/ExternalPackage_glyphy.mk b/external/glyphy/ExternalPackage_glyphy.mk
index cbae840b894e..b4a32fccc082 100644
--- a/external/glyphy/ExternalPackage_glyphy.mk
+++ b/external/glyphy/ExternalPackage_glyphy.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_ExternalPackage_use_external_project,glyphy,glyphy))
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.dylib,src/.libs/libglyphy.dylib))
+else ifeq ($(OS),WNT)
+# We build a static archive with MSVC, so nothing to add
else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.so.0,src/.libs/libglyphy.so.0.0.0))
endif