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

Fix build with Visual Studio

Browse source
This commit is contained in:
Jyrki Vesterinen 2017-02-18 17:47:17 +02:00
parent 993a760b4e
commit ef6b57aa25
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
projectfiles/VC12/wesnoth.vcxproj
View file

@ -3870,14 +3870,6 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Widgets\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Widgets\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\widgets\scrollpane.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Widgets\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Widgets\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Widgets\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Widgets\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Widgets\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Widgets\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\widgets\slider.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Widgets\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Widgets\</ObjectFileName>
@ -4501,7 +4493,6 @@
<ClInclude Include="..\..\src\widgets\menu.hpp" />
<ClInclude Include="..\..\src\widgets\scrollarea.hpp" />
<ClInclude Include="..\..\src\widgets\scrollbar.hpp" />
<ClInclude Include="..\..\src\widgets\scrollpane.hpp" />
<ClInclude Include="..\..\src\widgets\slider.hpp" />
<ClInclude Include="..\..\src\widgets\textbox.hpp" />
<ClInclude Include="..\..\src\widgets\widget.hpp" />

6
projectfiles/VC12/wesnoth.vcxproj.filters
View file

@ -968,9 +968,6 @@
<ClCompile Include="..\..\src\widgets\scrollbar.cpp">
<Filter>Widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\src\widgets\scrollpane.cpp">
<Filter>Widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\src\widgets\slider.cpp">
<Filter>Widgets</Filter>
</ClCompile>
@ -2412,9 +2409,6 @@
<ClInclude Include="..\..\src\widgets\scrollbar.hpp">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\src\widgets\scrollpane.hpp">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\src\widgets\slider.hpp">
<Filter>Widgets</Filter>
</ClInclude>

1
src/image_modifications.hpp
View file

@ -20,6 +20,7 @@
#include "sdl/surface.hpp"
#include "sdl/utils.hpp"
#include <functional>
#include <map>
#include <queue>