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 /avmedia | |
| 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 'avmedia')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 5 | ||||
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 184c66c7d201..7cc08fac16ef 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ )) endif -ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE))) +ifeq ($(ENABLE_COLLADA),TRUE) $(eval $(call gb_Library_set_warnings_not_errors,avmedia)) ifeq ($(OS),LINUX) @@ -68,9 +68,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\ png \ )) -$(eval $(call gb_Library_add_defs,avmedia,\ - -DENABLE_COLLADA2GLTF \ -)) endif $(eval $(call gb_Library_add_exception_objects,avmedia,\ diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 6119cb71acbf..8c4251e32041 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) { @@ -242,7 +244,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 |