summaryrefslogtreecommitdiffstats
path: root/avmedia/Library_avmedia.mk
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-06-11 12:36:26 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-06-12 21:43:35 +0200
commitfe70101856332663f600df144b39d2638b3d0570 (patch)
treedb4a1ba9353118269eec8738d6c3571bbb1c6d13 /avmedia/Library_avmedia.mk
parentAvoid possible memory leaks in case of exceptions (diff)
downloadcore-fe70101856332663f600df144b39d2638b3d0570.tar.gz
core-fe70101856332663f600df144b39d2638b3d0570.zip
Introduce HAVE_FEATURE_GLTF to enable/disable gltf related code
When it is a release build then enable it only on Windows and Linux. Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
Diffstat (limited to 'avmedia/Library_avmedia.mk')
-rw-r--r--avmedia/Library_avmedia.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 40ba35bbf976..63e9067ec38c 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -47,6 +47,12 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
$(gb_UWINAPI) \
))
+ifeq ($(ENABLE_GLTF),TRUE)
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+ avmedia/source/framework/modeltools \
+))
+endif
+
ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE)))
$(eval $(call gb_Library_set_warnings_not_errors,avmedia))
@@ -74,7 +80,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/framework/mediamisc \
avmedia/source/framework/mediaplayer \
avmedia/source/framework/mediatoolbox \
- avmedia/source/framework/modeltools \
avmedia/source/framework/soundhandler \
avmedia/source/viewer/mediaevent_impl \
avmedia/source/viewer/mediawindow \