summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-05-30 16:37:56 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-05-24 18:15:03 +0200
commit048ab968366184909f8b377368263dbec9656102 (patch)
treeb8b40672760eb7a78e48d52b743a800b6659e341
parentec8d4dbe31f2f5bc58100b701121d872982367e7 (diff)
gbuild: define _WIN32_WINNT = _WIN32_WINNT_WIN7 = 0x0601
And rely on implicitly derived _WIN32_IE = _WIN32_IE_WIN7 = _WIN32_IE_IE80 Change-Id: I94717e2ed66387bdc76f9047c02c0820d4adc1f9 (cherry picked from commit 2829dabaf37e6d9c736430f3fb9bbfb786b078ad)
-rw-r--r--solenv/gbuild/platform/windows.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index ebd2a3c86a94..65a4f982320a 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -24,13 +24,11 @@ gb_Helper_LIBRARY_PATH_VAR := PATH
gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
# define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
-# with a 7.1 SDK target Windows XP, with 8.x SDK target Windows Vista
-# currently _WIN32_IE is defined to a higher version than would be derived
-# in sdkddkver.h from _WIN32_WINNT=0x0502 but if _WIN32_WINNT >= 0x0600
-# the derived value is sufficient
+# 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 := \
- -D_WIN32_WINNT=$(if $(filter 70,$(WINDOWS_SDK_VERSION)),0x0502,0x0600) \
- -D_WIN32_IE=0x0700 \
+ -D_WIN32_WINNT=0x0601 \
-DWIN32 \
-DWNT \
-DNOMINMAX \