diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-11 23:06:47 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-18 20:52:24 -0500 |
| commit | 12152d253e48353254645b768c28d67e1e280a70 (patch) | |
| tree | e03c55911e16ec73056a21795411fa5081f71bd2 /extensions | |
| parent | 3b87d3dd507cd48286160e62383f48e2f70f0067 (diff) | |
Replace GUIBASE checks with equivalent OS checks
The idea is to get rid of GUIBASE and GUI checks as much as possible.
GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID
Don't set GUIBASE to these values any more in configure.ac
either.
GUIBASE_FOR_BUILD is not used anywhere.
Conflicts:
configure.ac
postprocess/packcomponents/makefile.mk
postprocess/packregistry/makefile.mk
Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_pl.mk | 6 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index e849cfd38558..a5b1f70a98cf 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -77,7 +77,7 @@ endif # GUI=WNT ifeq ($(GUI),UNX) -ifeq ($(GUIBASE),aqua) +ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,pl,\ extensions/source/plugin/aqua/macmgr \ @@ -90,7 +90,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,pl,\ CoreFoundation \ )) -else # GUIBASE!=aqua +else # OS!=MACOSX ifeq ($(ENABLE_GTK),TRUE) $(eval $(call gb_Library_add_defs,pl,\ @@ -114,7 +114,7 @@ $(eval $(call gb_Library_add_libs,pl,\ -lX11 \ )) -endif # GUIBASE=aqua +endif # OS=MACOSX endif # GUI=UNX diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 7bd6348ce797..4912721ea94a 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -110,7 +110,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ )) ifeq ($(GUI),UNX) -ifneq ($(GUIBASE),aqua) +ifneq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,extensions,\ StaticLibrary_plugcon \ Executable_pluginapp.bin \ |