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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b42dce252f53..cd991084ec35 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3324,6 +3324,8 @@ endef endif # SYSTEN_LIBGLTF +ifeq ($(ENABLE_COLLADA),TRUE) + define gb_LinkTarget__use_opencollada_parser $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ @@ -3354,7 +3356,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ) endef -endif +endif # ENABLE_COLLADA + +endif # ENABLE_GLTF ### Jars ############################################################ |