Update MSVC project and fix warnings

This commit is contained in:
Celtic Minstrel 2016-12-18 13:19:02 -05:00
parent c3ed1c75aa
commit d46d713fb9
3 changed files with 16 additions and 2 deletions

View file

@ -1700,6 +1700,13 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\gui\dialogs\attack_predictions.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\gui\dialogs\campaign_difficulty.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
@ -4115,6 +4122,7 @@
<ClInclude Include="..\..\src\gui\dialogs\addon\manager.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\addon\uninstall_list.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\advanced_graphics_options.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\attack_predictions.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\campaign_difficulty.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\campaign_selection.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\campaign_settings.hpp" />

View file

@ -1519,6 +1519,9 @@
<ClCompile Include="..\..\src\font\text_surface.cpp">
<Filter>Font</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\dialogs\attack_predictions.cpp">
<Filter>Gui\Dialogs</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\addon\client.hpp">
@ -2946,6 +2949,9 @@
<ClInclude Include="..\..\src\font\pango\stream_ops.hpp">
<Filter>Font\Pango</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\dialogs\attack_predictions.hpp">
<Filter>Gui\Dialogs</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">

View file

@ -20,9 +20,9 @@
#include "units/map.hpp"
class battle_context;
class battle_context_unit_stats;
struct battle_context_unit_stats;
class CVideo;
class map_location;
struct map_location;
struct combatant;
namespace gui2