diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-23 19:06:58 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-26 18:45:04 +0200 |
| commit | 5a5c8e253abbef5626dab70f8978275ac3c742f8 (patch) | |
| tree | 86c65cdfbff8ea0140937dee1311f65619f9aaf7 /solenv/gbuild/gbuild.mk | |
| parent | 3ee3e7946c4a772fd13eada4b235479581190dce (diff) | |
Check feature test macros instead of ANDROID and/or IOS
Pass -DLIBO_FEATURE_FOO to compiler for some elements in BUILD_TYPE.
BUILD_TYPE has at least two kinds of elements: Those that indicate
building a bundled copy of some 3rd-party library, and those that
indicate some specific feature of the LibreOffice platform or
build-time configuration choice. This is for the latter kind.
Change many of the checks for Android and/or iOS in the source code to
check LIBO_FEATURE_DESKTOP, LIBO_FEATURE_HELP or DISABLE_EXTENSIONS
instead, in cases where that is what is meant, not Android or iOS
specifically.
Change-Id: I2cd3f3bb99e953c7754dcea76a426f8f9d61e4db
Diffstat (limited to 'solenv/gbuild/gbuild.mk')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 5a4161e5abcb..d026cd900364 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -277,6 +277,9 @@ gb_GLOBALDEFS += \ ENABLE_READONLY_INSTALLSET \ ) +gb_GLOBALDEFS += \ + $(call gb_Helper_define_if_in,DESKTOP HELP,$(BUILD_TYPE)) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) include $(GBUILDDIR)/Deliver.mk |