0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump min required Windows version to 7

Browse source 
Technically, all this code should work on Vista, (including the recent switch to using
SHGetKnownFolderPath), but since we're also considering requiring Visual Studio 2017
for building, we need Windows 7.

(cherry-picked from commit 2a585118d8)
This commit is contained in:
Charles Dang 2018-05-11 10:56:11 +11:00
parent d053a875a4
commit ee2b9d242e
10 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -602,7 +602,7 @@ for env in [test_env, client_env, env]:
env[d] = os.path.join(env["prefix"], env[d]) env[d] = os.path.join(env["prefix"], env[d])
if env["PLATFORM"] == 'win32': if env["PLATFORM"] == 'win32':
env.Append(LIBS = ["wsock32", "iconv", "z", "shlwapi", "winmm"], CCFLAGS = ["-mthreads"], LINKFLAGS = ["-mthreads"], CPPDEFINES = ["_WIN32_WINNT=0x0501"]) env.Append(LIBS = ["wsock32", "iconv", "z", "shlwapi", "winmm"], CCFLAGS = ["-mthreads"], LINKFLAGS = ["-mthreads"], CPPDEFINES = ["_WIN32_WINNT=0x0601"])
if env["PLATFORM"] == 'darwin': # Mac OS X if env["PLATFORM"] == 'darwin': # Mac OS X
env.Append(FRAMEWORKS = "Cocoa") # Cocoa GUI env.Append(FRAMEWORKS = "Cocoa") # Cocoa GUI

2
changelog.md
View file

@ -25,6 +25,8 @@
* Added custom graphics for the broken tree in S1. * Added custom graphics for the broken tree in S1.
* Fixed a bug in the formation ability causing defense bonuses not being * Fixed a bug in the formation ability causing defense bonuses not being
received in some cases. received in some cases.
### Engine
* Windows 7 is now the minimum supported Windows version.
### Help browser ### Help browser
* Unit descriptions use the new multiplication sign format for attack lists * Unit descriptions use the new multiplication sign format for attack lists
now (issue #2873). now (issue #2873).

4
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -41,8 +41,8 @@
<Add option="-Wunused-parameter" /> <Add option="-Wunused-parameter" />
<Add option="-DHAVE_LIBPNG" /> <Add option="-DHAVE_LIBPNG" />
<Add option="-D_WIN32_WINDOWS" /> <Add option="-D_WIN32_WINDOWS" />
<Add option="-D_WIN32_WINNT=0x0501" /> <Add option="-D_WIN32_WINNT=0x0601" />
<Add option="-D_WIN32_IE=0x0501" /> <Add option="-D_WIN32_IE=0x0601" />
<Add directory="../../src" /> <Add directory="../../src" />
</Compiler> </Compiler>
<Linker> <Linker>

2
projectfiles/VC14/campaignd.vcxproj
View file

@ -64,7 +64,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\src;..\..\..\external\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\..\external\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WINXP;_SCL_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WIN7;_SCL_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4244;4127</DisableSpecificWarnings> <DisableSpecificWarnings>4244;4127</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>

2
projectfiles/VC14/wesnoth.vcxproj
View file

@ -156,7 +156,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\..\src;..\..\..\external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\..\external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WINXP;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;HAVE_LIBPNG;NOMINMAX;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WIN7;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;HAVE_LIBPNG;NOMINMAX;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>

2
projectfiles/VC14/wesnothd.vcxproj
View file

@ -112,7 +112,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\src;..\..\..\external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\..\external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WINXP;HAVE_PYTHON;USE_GZIP;NOMINMAX;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WIN7;HAVE_PYTHON;USE_GZIP;NOMINMAX;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<OpenMPSupport> <OpenMPSupport>

2
src/desktop/windows_tray_notification.cpp
View file

@ -135,9 +135,7 @@ bool windows_tray_notification::create_tray_icon()
nid->uCallbackMessage = WM_TRAYNOTIFY; nid->uCallbackMessage = WM_TRAYNOTIFY;
nid->uID = ICON_ID; nid->uID = ICON_ID;
nid->hIcon = icon; nid->hIcon = icon;
#if _WIN32_WINNT >= 0x600
nid->hBalloonIcon = icon; nid->hBalloonIcon = icon;
#endif
lstrcpyW(nid->szTip, wtip.c_str()); lstrcpyW(nid->szTip, wtip.c_str());
// creating icon notification // creating icon notification

2
src/desktop/windows_tray_notification.hpp
View file

@ -22,7 +22,7 @@
#endif #endif
//defines that mingw misses //defines that mingw misses
#ifndef _WIN32_IE #ifndef _WIN32_IE
#define _WIN32_IE 0x0600 //specifying target platform to be Windows XP and higher #define _WIN32_IE _WIN32_WINNT_WIN7 //specifying target platform to be Windows 7 and higher
#endif #endif
#ifndef NIIF_USER #ifndef NIIF_USER
#define NIIF_USER 0x00000004 #define NIIF_USER 0x00000004

4
src/network_asio.hpp
View file

@ -16,10 +16,6 @@
#ifdef _WIN32 #ifdef _WIN32
#if _WIN32_WINNT < _WIN32_WINNT_VISTA
#define BOOST_ASIO_DISABLE_IOCP
#endif
#ifdef INADDR_ANY #ifdef INADDR_ANY
#undef INADDR_ANY #undef INADDR_ANY
#endif #endif

4
src/wesnothd_connection.hpp
View file

@ -16,10 +16,6 @@
#ifdef _WIN32 #ifdef _WIN32
#if _WIN32_WINNT < _WIN32_WINNT_VISTA
#define BOOST_ASIO_DISABLE_IOCP
#endif
#ifdef INADDR_ANY #ifdef INADDR_ANY
#undef INADDR_ANY #undef INADDR_ANY
#endif #endif