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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 015eb882adc8..7798c79b28d3 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -126,7 +126,7 @@ endef endif -ifeq (SANEUNX,$(filter SANE,$(BUILD_TYPE))$(GUI)) +ifeq (SANE,$(filter SANE,$(BUILD_TYPE))$(filter WNT,$(OS))) define gb_LinkTarget__use_sane_headers $(call gb_Library_use_packages,$(1),\ @@ -1724,7 +1724,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ $(if $(filter MSC,$(COM)),lib)pq \ ) -ifeq ($(GUI)$(COM),WNTMSC) +ifeq ($(OS)$(COM),WNTMSC) $(call gb_LinkTarget_use_external,$(1),openssl) $(call gb_LinkTarget_use_system_win32_libs,$(1),\ @@ -1775,7 +1775,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ mozreg_s \ ) -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(call gb_LinkTarget_add_defs,$(1),\ -DMOZILLA_CLIENT \ @@ -1818,7 +1818,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endif # !GCC -else ifeq ($(GUI),UNX) +else $(call gb_LinkTarget_add_defs,$(1),\ -DMOZILLA_CLIENT \ |