diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-29 14:14:31 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2014-08-29 12:43:47 -0500 |
| commit | 6d239ee19a4b1d9068fbd04b5a692c859142f613 (patch) | |
| tree | 186bb849ebb5affe5c3e205c0af470327971aa00 /include | |
| parent | 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2 (diff) | |
Handle collada libraries seperately: --disable-collada
Depends on gltf support.
(cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507)
Conflicts:
config_host.mk.in
sd/source/ui/func/fuinsert.cxx
Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
Reviewed-on: https://gerrit.libreoffice.org/11193
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/avmedia/modeltools.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx index ed2de44cf64b..526b2403f6b3 100644 --- a/include/avmedia/modeltools.hxx +++ b/include/avmedia/modeltools.hxx @@ -11,9 +11,13 @@ #include <com/sun/star/frame/XModel.hpp> #include <avmedia/avmediadllapi.h> +#include <config_features.h> + namespace avmedia { +#if HAVE_FEATURE_COLLADA bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput); +#endif bool AVMEDIA_DLLPUBLIC Embed3DModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, |