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

Suppress upstream variable-hide-variable errors.

Browse source 
(cherry-picked from commit c187f069e8)
This commit is contained in:
lundberg 2018-03-19 11:14:10 -05:00
parent 4f97d6794b
commit c04d542e55
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
projectfiles/VC14/wesnoth.vcxproj
View file

@ -2890,6 +2890,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>
<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>

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;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
</ClCompile>

4
projectfiles/VC14/wesnothlib.vcxproj
View file

@ -144,7 +144,9 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Formula\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\game_config.cpp" />
<ClCompile Include="..\..\src\gettext_boost.cpp" />
<ClCompile Include="..\..\src\gettext_boost.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ClCompile Include="..\..\src\log.cpp" />
<ClCompile Include="..\..\src\log_windows.cpp" />
<ClCompile Include="..\..\src\random.cpp" />