diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-17 22:09:44 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-17 22:18:02 +0300 |
| commit | 262aa2c2e540c803196d53779fb72226a8efeb5f (patch) | |
| tree | 6e27c452faa73094b0590f493945b55ab3483f18 /slideshow | |
| parent | f5ccbfdc561c68099872d1abe07ac72fcddedd35 (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 'slideshow')
| -rw-r--r-- | slideshow/Library_slideshow.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index fb5e93deb3f6..ccd3e9964a9d 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_use_external,slideshow,boost_headers)) $(eval $(call gb_Library_use_sdk_api,slideshow)) $(eval $(call gb_Library_use_libraries,slideshow,\ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ canvastools \ comphelper \ |