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

Fix VC warnings about upstream issues

Browse source 
Disable some warnings pertaining to Boost issues such as name-hides-global.

(cherry-picked from commit a8539cfca0)
This commit is contained in:
lundberg 2018-03-25 20:13:21 -05:00
parent e0b35791e2
commit 3f98bdb04b
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
projectfiles/VC14/campaignd.vcxproj
View file

@ -115,6 +115,7 @@
</ClCompile>
<ClCompile Include="..\..\src\server\simple_wml.cpp">
<ObjectFileName>$(IntDir)Server\</ObjectFileName>
<DisableSpecificWarnings>4458</DisableSpecificWarnings>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

4
projectfiles/VC14/wesnoth.vcxproj
View file

@ -2884,7 +2884,7 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Terrain\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\terrain\translation.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Terrain\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Terrain\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Terrain\</ObjectFileName>
@ -3370,7 +3370,7 @@
<ClCompile Include="..\..\src\variable_info.cpp" />
<ClCompile Include="..\..\src\video.cpp" />
<ClCompile Include="..\..\src\wesnoth.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">true</ExcludedFromBuild>
</ClCompile>

2
projectfiles/VC14/wesnothd.vcxproj
View file

@ -222,7 +222,7 @@
</ClCompile>
<ClCompile Include="..\..\src\server\simple_wml.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4706;4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>

6
projectfiles/VC14/wesnothlib.vcxproj
View file

@ -145,17 +145,17 @@
</ClCompile>
<ClCompile Include="..\..\src\game_config.cpp" />
<ClCompile Include="..\..\src\gettext_boost.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ClCompile Include="..\..\src\log.cpp" />
<ClCompile Include="..\..\src\log_windows.cpp" />
<ClCompile Include="..\..\src\random.cpp" />
<ClCompile Include="..\..\src\serialization\base64.cpp" />
<ClCompile Include="..\..\src\serialization\binary_or_text.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ClCompile Include="..\..\src\serialization\parser.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ClCompile Include="..\..\src\serialization\preprocessor.cpp" />
<ClCompile Include="..\..\src\serialization\schema_validator.cpp" />