solenv/gbuild/platform/com_MSC_defs.mk | 1 - solenv/gbuild/platform/windows.mk | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit 0daa37b6d0a37ee889dc52bbd1b910d0f88f378f Author: Michael Stahl <[email protected]> AuthorDate: Tue May 30 17:00:42 2017 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Fri May 24 18:15:19 2019 +0200 gbuild: stop defining _USING_V110_SDK71_ Change-Id: Ic8eee967269b3666b15795f20ee62817dadfb0ff (cherry picked from commit 713ed7b338b467b176af7eb5e9a80559b8496e8e) diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 63b9e29d5d55..424dad3686d9 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -54,7 +54,6 @@ gb_COMPILERDEFS := \ -D_MT \ -D_DLL \ -DCPPU_ENV=$(gb_CPPU_ENV) \ - $(if $(findstring 140_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ ifeq ($(CPUNAME),INTEL) gb_COMPILERDEFS += \ commit 048ab968366184909f8b377368263dbec9656102 Author: Michael Stahl <[email protected]> AuthorDate: Tue May 30 16:37:56 2017 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Fri May 24 18:15:03 2019 +0200 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) 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 \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
