diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-13 17:17:38 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-13 17:17:52 +0200 |
| commit | 12ddc6d01bfae7cede15feac8e1fd60d59843a41 (patch) | |
| tree | cb0493262bb3f394c0edcc57ae40962103c4124e /Library_merged.mk | |
| parent | 106d9b392bd59f52775eeb09e2a4e8b20828894b (diff) | |
add externals for libmerged too
Change-Id: I6801745e25d31e951ed9d0dcf1e2d93aa55905e4
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index ecc72ab7df06..4cfff2bfc06b 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 \ )) |