summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-17 22:09:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-17 22:18:02 +0300
commit262aa2c2e540c803196d53779fb72226a8efeb5f (patch)
tree6e27c452faa73094b0590f493945b55ab3483f18 /sd
parentf5ccbfdc561c68099872d1abe07ac72fcddedd35 (diff)
More generic way to disable avmedia
Introduce a configure option --disable-avmedia. For non-desktop, avmedia is always disabled (for now), and for desktop enabled by default. Add AVMEDIA to BUILD_TYPE when enabled. Don't build avmedia when disabled. Add HAVE_FEATURE_AVMEDIA to <config_features.h>. Bypass avmedia-related code when disabled. Change-Id: I919c6e199bff87d9f142d55dff6373f0ed217f39
Diffstat (limited to 'sd')
-rw-r--r--sd/Library_sd.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index deae271cd836..7ce290582147 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_use_custom_headers,sd,\
$(eval $(call gb_Library_use_sdk_api,sd))
$(eval $(call gb_Library_use_libraries,sd,\
- avmedia \
+ $(call gb_Helper_optional,AVMEDIA,avmedia) \
basegfx \
canvastools \
comphelper \