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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
| -rw-r--r-- | sfx2/source/bastyp/dummytypes.cxx | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index f4eafa2f9483..9ff7a3775849 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -119,6 +119,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/workwin \ sfx2/source/appl/xpackcreator \ sfx2/source/bastyp/bitset \ + sfx2/source/bastyp/dummytypes \ sfx2/source/bastyp/fltfnc \ sfx2/source/bastyp/fltlst \ sfx2/source/bastyp/frmhtml \ diff --git a/sfx2/source/bastyp/dummytypes.cxx b/sfx2/source/bastyp/dummytypes.cxx new file mode 100644 index 000000000000..e1ae0ad996cc --- /dev/null +++ b/sfx2/source/bastyp/dummytypes.cxx @@ -0,0 +1,18 @@ +// -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +// +// This file is part of the LibreOffice project. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#include <config_features.h> + +#include <tools/rtti.hxx> +#include <avmedia/mediaitem.hxx> + +#if !HAVE_FEATURE_AVMEDIA +SAL_DLLPUBLIC_EXPORT TypeId avmedia::MediaItem::StaticType() { return 0; } +#endif + +// vim:set shiftwidth=4 softtabstop=4 expandtab: |