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/Library_avmedia.mk | |
parent | Work around dirty Qt4 test code (diff) | |
download | core-191f0944fd8fc30493eda58c7adfdfa0b538f507.tar.gz core-191f0944fd8fc30493eda58c7adfdfa0b538f507.zip |
Handle collada libraries seperately: --disable-collada
Depends on gltf support.
Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
Diffstat (limited to 'avmedia/Library_avmedia.mk')
-rw-r--r-- | avmedia/Library_avmedia.mk | 5 |
1 files changed, 1 insertions, 4 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,\ |