diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-12 01:07:09 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:53:25 +0000 |
| commit | c29098917a1118d4b435df2b5f542adc8505e123 (patch) | |
| tree | f9407e3cf21b49abb40d536f73364abbddcb5ea3 /desktop | |
| parent | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (diff) | |
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.
Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_oosplash.mk | 2 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 3fa96d4f57ce..b67e08dc67e5 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\ endif ifneq ($(GUIBASE),headless) -ifeq ($(GUI),UNX) +ifneq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,oosplash,\ -lX11 \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 9f4b6da30bb1..e37db8f6456e 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_sdk_api,sofficeapp)) $(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 WNT,$(OS)),-DENABLE_QUICKSTART_APPLET) \ $(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \ $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \ )) |