From 58426958ab159ed1f05f6425f914f969dc954e25 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 8 Mar 2019 07:07:46 -0500 Subject: Utilities/Release: Update for using Windows 10 SDK In commit e903a9fc55 (Utilities/Release: Create a Windows 64-bit binary, 2016-03-16, v3.6.0-rc1~235^2~2) we added a `_USING_V110_SDK71_` macro to tell the MSVC standard library headers they were using an older SDK. The environment in which our Windows binaries are produced has been updated to use a Windows 10 SDK now that we do not need to support WinXP, so we can drop the definition. --- Utilities/Release/win32_release.cmake | 2 +- Utilities/Release/win64_release.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index c03c665..e76e333 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -31,7 +31,7 @@ CMAKE_PREFIX_PATH:STRING=${qt_prefix} CMake_TEST_Qt4:BOOL=OFF CMake_TEST_Qt5:BOOL=OFF ") -set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000 -D_USING_V110_SDK71_") +set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000") set(CFLAGS "${ppflags}") set(CXXFLAGS "${ppflags}") set(ENV ". ~/rel/env32") diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index 8417206..511f0a3 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -31,7 +31,7 @@ CMAKE_PREFIX_PATH:STRING=${qt_prefix} CMake_TEST_Qt4:BOOL=OFF CMake_TEST_Qt5:BOOL=OFF ") -set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000 -D_USING_V110_SDK71_") +set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000") set(CFLAGS "${ppflags}") set(CXXFLAGS "${ppflags}") set(ENV ". ~/rel/env64") -- cgit v0.12 From adba2945b301ae1bc35dfbc70125654c8db237a7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 8 Mar 2019 07:14:15 -0500 Subject: Utilities/Release: Update to Qt 5.12 on Windows builds --- Utilities/Release/win32_release.cmake | 8 ++++++-- Utilities/Release/win64_release.cmake | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index e76e333..1e4421c 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -8,12 +8,16 @@ set(CPACK_BINARY_GENERATORS "WIX ZIP") set(CPACK_SOURCE_GENERATORS "ZIP") set(MAKE_PROGRAM "ninja") set(MAKE "${MAKE_PROGRAM} -j16") -set(qt_prefix "c:/Qt/5.6.3/msvc2017-32-xp-mt") +set(qt_prefix "c:/Qt/5.12.1/msvc2017-32-w7-mt") set(qt_win_libs ${qt_prefix}/plugins/platforms/qwindows.lib - ${qt_prefix}/lib/Qt5PlatformSupport.lib + ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib + ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib + ${qt_prefix}/lib/Qt5ThemeSupport.lib ${qt_prefix}/lib/qtfreetype.lib + ${qt_prefix}/lib/qtlibpng.lib imm32.lib + wtsapi32.lib ) set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release CMAKE_DOC_DIR:STRING=doc/cmake diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index 511f0a3..98eaf19 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -8,12 +8,16 @@ set(CPACK_BINARY_GENERATORS "WIX ZIP") set(CPACK_SOURCE_GENERATORS "") set(MAKE_PROGRAM "ninja") set(MAKE "${MAKE_PROGRAM} -j16") -set(qt_prefix "c:/Qt/5.6.3/msvc2017-64-xp-mt") +set(qt_prefix "c:/Qt/5.12.1/msvc2017-64-w7-mt") set(qt_win_libs ${qt_prefix}/plugins/platforms/qwindows.lib - ${qt_prefix}/lib/Qt5PlatformSupport.lib + ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib + ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib + ${qt_prefix}/lib/Qt5ThemeSupport.lib ${qt_prefix}/lib/qtfreetype.lib + ${qt_prefix}/lib/qtlibpng.lib imm32.lib + wtsapi32.lib ) set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release CMAKE_DOC_DIR:STRING=doc/cmake -- cgit v0.12