[Libreoffice-commits] core.git: Library_merged.mk

[Matúš Kukan]

 Library_merged.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 12ddc6d01bfae7cede15feac8e1fd60d59843a41
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue May 13 17:17:38 2014 +0200

    add externals for libmerged too
    
    Change-Id: I6801745e25d31e951ed9d0dcf1e2d93aa55905e4

diff --git a/Library_merged.mk b/Library_merged.mk
index ecc72ab..4cfff2b 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_externals,merged,\
 	boost_headers \
 	boostdatetime \
 	$(call gb_Helper_optional,DESKTOP,clucene) \
+	$(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \
 	cups \
 	curl \
 	dbus \
@@ -58,6 +59,8 @@ $(eval $(call gb_Library_use_externals,merged,\
 	mesa_headers \
 	mythes \
 	nss3 \
+	$(call gb_Helper_optional,COLLADA2GLTF,opencollada_parser) \
+	$(call gb_Helper_optional,COLLADA2GLTF,png) \
 	telepathy \
 	zlib \
 ))