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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 4a6fccf940ab..9f4b6da30bb1 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\ -DDESKTOP_DLLIMPLEMENTATION \ $(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \ $(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \ - $(if $(filter aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \ + $(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \ $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \ )) @@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ $(gb_UWINAPI) \ )) -ifeq ($(GUIBASE),cocoatouch) +ifeq ($(OS),IOS) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ )) |