diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-10 19:36:11 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-11 00:55:03 +0200 |
| commit | c8481c8a43ce2544275b2d70ef29a8b0cb157732 (patch) | |
| tree | 0de0d51a749414f1ec6107cb091c9a7e917d8672 /solenv | |
| parent | 40e22f1e1bd44a1aa56ff77b82f1306ed1076ebf (diff) | |
Drop duplicate WINVER and _WIN32_WINNT defines
Just keep the definition of _WIN32_WINNT in windows.mk, which
claims it automatically derivates WINVER in some sdk header.
Change-Id: I0a83e91ffdc9e0fc847433a92a45424fbfcb189c
Reviewed-on: https://gerrit.libreoffice.org/61631
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 252690c8c0a8..e6afe0b5ad2a 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -66,8 +66,7 @@ gb_COMPILERDEFS += \ endif gb_RCDEFS := \ - -DWINVER=0x0502 \ - -DWIN32 \ + $(gb_WIN_VERSION_DEFS) \ gb_RCFLAGS := diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 51e8906e16f3..a8ba5b1d1717 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -26,10 +26,13 @@ gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX # current baseline is Windows 7 (NT 6.1) # for _WIN32_IE, if _WIN32_WINNT >= 0x0600 the derived value from # sdkddkver.h is sufficient -gb_OSDEFS := \ +gb_WIN_VERSION_DEFS := \ -D_WIN32_WINNT=0x0601 \ -DWIN32 \ -DWNT \ + +gb_OSDEFS := \ + $(gb_WIN_VERSION_DEFS) \ -DNOMINMAX \ $(LFS_CFLAGS) \ |