diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-07 15:21:41 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-07 15:42:57 +0200 |
commit | 191f0944fd8fc30493eda58c7adfdfa0b538f507 (patch) | |
tree | d0f8416ff215f3cf1b578b3e051fd198c1e899ff /avmedia/source | |
parent | 7479729487e167c61c69b77f5e270e639160005b (diff) |
Handle collada libraries seperately: --disable-collada
Depends on gltf support.
Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
Diffstat (limited to 'avmedia/source')
-rw-r--r-- | avmedia/source/framework/modeltools.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 87c75191de9c..4360f424f5cf 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -29,7 +29,9 @@ #include <boost/foreach.hpp> #include <boost/optional.hpp> -#ifdef ENABLE_COLLADA2GLTF +#include <config_features.h> + +#if HAVE_FEATURE_COLLADA #include <COLLADA2GLTFWriter.h> #include <GLTFAsset.h> #endif @@ -42,7 +44,7 @@ using namespace boost::property_tree; namespace avmedia { -#ifdef ENABLE_COLLADA2GLTF +#if HAVE_FEATURE_COLLADA static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFolderURL, OUString& o_rDaeFileURL) { @@ -241,7 +243,8 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, const OUString& rSourceURL, OUString& o_rEmbeddedURL) { OUString sSource = rSourceURL; -#ifdef ENABLE_COLLADA2GLTF + +#if HAVE_FEATURE_COLLADA if( !rSourceURL.endsWithIgnoreAsciiCase(".json") ) KmzDae2Gltf(rSourceURL, sSource); #endif |