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 /dbaccess | |
| 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 'dbaccess')
| -rw-r--r-- | dbaccess/Library_dbu.mk | 6 | ||||
| -rw-r--r-- | dbaccess/Module_dbaccess.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 9bfe58bb6758..ba95c73734fc 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,dbu,\ -DDBACCESS_DLLIMPLEMENTATION \ )) -ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h +ifeq ($(OS)$(COM),WNTGCC) # for adoint.h $(eval $(call gb_Library_add_cxxflags,dbu,\ -fpermissive \ )) @@ -74,7 +74,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\ $(gb_UWINAPI) \ )) -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,dbu,\ ole32 \ oleaut32 \ @@ -268,7 +268,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/uno/UserSettingsDlg \ )) -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/dlg/adodatalinks \ )) diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index f087ba8e5c19..3195bbf1ff85 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\ AllLangResTarget_dbmm \ AllLangResTarget_dbu \ AllLangResTarget_sdbt \ - $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \ + $(if $(filter WNT,$(OS)),Executable_odbcconfig) \ Library_dba \ Library_dbaxml \ Library_dbmm \ |