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

Fix the build, separate fixes for VC16 and GCC-10 (#5037)

Browse source 
I'm relying on Travis to check whether the VC16 fix is correct,
as I don't have a Windows install to test this locally.
This commit is contained in:
Steve Cotton 2020-08-07 19:06:54 +02:00 • committed by GitHub
parent 6d73033445
commit 711b9388e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
projectfiles/VC16/campaignd.vcxproj
View file

@ -95,38 +95,38 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\addon\validation.hpp" />
<ClInclude Include="..\..\src\campaign_server\addon_utils.hpp" />
<ClInclude Include="..\..\src\campaign_server\blacklist.hpp" />
<ClInclude Include="..\..\src\campaign_server\campaign_server.hpp" />
<ClInclude Include="..\..\src\campaign_server\control.hpp" />
<ClInclude Include="..\..\src\campaign_server\fs_commit.hpp" />
<ClInclude Include="..\..\src\server\campaignd\addon_utils.hpp" />
<ClInclude Include="..\..\src\server\campaignd\blacklist.hpp" />
<ClInclude Include="..\..\src\server\campaignd\server.hpp" />
<ClInclude Include="..\..\src\server\campaignd\control.hpp" />
<ClInclude Include="..\..\src\server\campaignd\fs_commit.hpp" />
<ClInclude Include="..\..\src\hash.hpp" />
<ClInclude Include="..\..\src\server\server_base.hpp" />
<ClInclude Include="..\..\src\server\simple_wml.hpp" />
<ClInclude Include="..\..\src\server\common\server_base.hpp" />
<ClInclude Include="..\..\src\server\common\simple_wml.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\addon\validation.cpp">
<ObjectFileName>$(IntDir)Addon\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\campaign_server\addon_utils.cpp">
<ClCompile Include="..\..\src\server\campaignd\addon_utils.cpp">
<ObjectFileName>$(IntDir)Campaign_Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\campaign_server\blacklist.cpp">
<ClCompile Include="..\..\src\server\campaignd\blacklist.cpp">
<ObjectFileName>$(IntDir)Campaign_Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\campaign_server\campaign_server.cpp">
<ClCompile Include="..\..\src\server\campaignd\server.cpp">
<ObjectFileName>$(IntDir)Campaign_Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\campaign_server\fs_commit.cpp">
<ClCompile Include="..\..\src\server\campaignd\fs_commit.cpp">
<ObjectFileName>$(IntDir)Campaign_Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\hash.cpp">
<ObjectFileName>$(IntDir)</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\server_base.cpp">
<ClCompile Include="..\..\src\server\common\server_base.cpp">
<ObjectFileName>$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\simple_wml.cpp">
<ClCompile Include="..\..\src\server\common\simple_wml.cpp">
<ObjectFileName>$(IntDir)Server\</ObjectFileName>
<DisableSpecificWarnings>4706;4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>

2
projectfiles/VC16/files_with_deactivated_warnings.txt
View file

@ -6,4 +6,4 @@ game
network_asio
serialization/binary_or_text
serialization/parser
server/simple_wml
server/common/simple_wml

50
projectfiles/VC16/wesnothd.vcxproj
View file

@ -310,7 +310,7 @@
<ItemGroup>
<ClCompile Include="..\..\src\mt_rng.cpp" />
<ClCompile Include="..\..\src\seed_rng.cpp" />
<ClCompile Include="..\..\src\server\ban.cpp">
<ClCompile Include="..\..\src\server\wesnothd\ban.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -318,7 +318,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\forum_user_handler.cpp">
<ClCompile Include="..\..\src\server\common\forum_user_handler.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -326,7 +326,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\game.cpp">
<ClCompile Include="..\..\src\server\wesnothd\game.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -334,7 +334,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\metrics.cpp">
<ClCompile Include="..\..\src\server\wesnothd\metrics.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -342,7 +342,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\dbconn.cpp">
<ClCompile Include="..\..\src\server\common\dbconn.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -350,7 +350,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\resultsets\tournaments.cpp">
<ClCompile Include="..\..\src\server\common\resultsets\tournaments.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -358,7 +358,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\resultsets\ban_check.cpp">
<ClCompile Include="..\..\src\server\common\resultsets\ban_check.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -366,7 +366,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\player.cpp">
<ClCompile Include="..\..\src\server\wesnothd\player.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -374,7 +374,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\player_connection.cpp">
<ClCompile Include="..\..\src\server\wesnothd\player_connection.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -382,7 +382,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\player_network.cpp">
<ClCompile Include="..\..\src\server\wesnothd\player_network.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -390,7 +390,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\server.cpp">
<ClCompile Include="..\..\src\server\wesnothd\server.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -398,7 +398,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\server_base.cpp">
<ClCompile Include="..\..\src\server\common\server_base.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
@ -406,7 +406,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\simple_wml.cpp">
<ClCompile Include="..\..\src\server\common\simple_wml.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<DisableSpecificWarnings>4706;4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@ -415,7 +415,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\server\user_handler.cpp">
<ClCompile Include="..\..\src\server\common\user_handler.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@ -427,17 +427,17 @@
<ItemGroup>
<ClInclude Include="..\..\src\mt_rng.hpp" />
<ClInclude Include="..\..\src\seed_rng.hpp" />
<ClInclude Include="..\..\src\server\ban.hpp" />
<ClInclude Include="..\..\src\server\forum_user_handler.hpp" />
<ClInclude Include="..\..\src\server\game.hpp" />
<ClInclude Include="..\..\src\server\metrics.hpp" />
<ClInclude Include="..\..\src\server\player.hpp" />
<ClInclude Include="..\..\src\server\player_connection.hpp" />
<ClInclude Include="..\..\src\server\player_network.hpp" />
<ClInclude Include="..\..\src\server\server.hpp" />
<ClInclude Include="..\..\src\server\server_base.hpp" />
<ClInclude Include="..\..\src\server\simple_wml.hpp" />
<ClInclude Include="..\..\src\server\user_handler.hpp" />
<ClInclude Include="..\..\src\server\common\forum_user_handler.hpp" />
<ClInclude Include="..\..\src\server\common\server_base.hpp" />
<ClInclude Include="..\..\src\server\common\simple_wml.hpp" />
<ClInclude Include="..\..\src\server\common\user_handler.hpp" />
<ClInclude Include="..\..\src\server\wesnothd\ban.hpp" />
<ClInclude Include="..\..\src\server\wesnothd\game.hpp" />
<ClInclude Include="..\..\src\server\wesnothd\metrics.hpp" />
<ClInclude Include="..\..\src\server\wesnothd\player.hpp" />
<ClInclude Include="..\..\src\server\wesnothd\player_connection.hpp" />
<ClInclude Include="..\..\src\server\wesnothd\player_network.hpp" />
<ClInclude Include="..\..\src\server\wesnothd\server.hpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="wesnothlib.vcxproj">

1
src/utils/shared_reference.hpp
View file

@ -16,6 +16,7 @@
#include "global.hpp"
#include <memory>
#include <stdexcept>
namespace utils {