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

MSVC project file cleanup

Browse source 
- Add a few missing headers
- Remove redundant headers
- Remove duplicate include of filesystem sources
- Remove an empty source file

[ci skip]
This commit is contained in:
Celtic Minstrel 2016-12-01 16:07:25 -05:00
parent 9cbd31dba7
commit c2ed9c5c19
10 changed files with 7 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
projectfiles/CodeBlocks-SCons/wesnoth.cbp
View file

@ -311,7 +311,6 @@
<Unit filename="../../src/game_display.hpp" />
<Unit filename="../../src/game_end_exceptions.cpp" />
<Unit filename="../../src/game_end_exceptions.hpp" />
<Unit filename="../../src/game_errors.cpp" />
<Unit filename="../../src/game_errors.hpp" />
<Unit filename="../../src/game_events/action_wml.cpp" />
<Unit filename="../../src/game_events/action_wml.hpp" />

1
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -396,7 +396,6 @@
<Unit filename="../../src/game_display.hpp" />
<Unit filename="../../src/game_end_exceptions.cpp" />
<Unit filename="../../src/game_end_exceptions.hpp" />
<Unit filename="../../src/game_errors.cpp" />
<Unit filename="../../src/game_errors.hpp" />
<Unit filename="../../src/game_events/action_wml.cpp" />
<Unit filename="../../src/game_events/action_wml.hpp" />

10
projectfiles/VC12/wesnoth.vcxproj
View file

@ -1142,8 +1142,6 @@
<ClCompile Include="..\..\src\events.cpp" />
<ClCompile Include="..\..\src\fake_unit_manager.cpp" />
<ClCompile Include="..\..\src\fake_unit_ptr.cpp" />
<ClCompile Include="..\..\src\filesystem_boost.cpp" />
<ClCompile Include="..\..\src\filesystem_common.cpp" />
<ClCompile Include="..\..\src\filesystem_sdl.cpp" />
<ClCompile Include="..\..\src\floating_label.cpp" />
<ClCompile Include="..\..\src\floating_textbox.cpp" />
@ -1282,7 +1280,6 @@
<ClCompile Include="..\..\src\game_data.cpp" />
<ClCompile Include="..\..\src\game_display.cpp" />
<ClCompile Include="..\..\src\game_end_exceptions.cpp" />
<ClCompile Include="..\..\src\game_errors.cpp" />
<ClCompile Include="..\..\src\game_events\action_wml.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Game_Events\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Game_Events\</ObjectFileName>
@ -3941,6 +3938,7 @@
<ClInclude Include="..\..\src\arrow.hpp" />
<ClInclude Include="..\..\src\attack_prediction.hpp" />
<ClInclude Include="..\..\src\attack_prediction_display.hpp" />
<ClInclude Include="..\..\src\buffered_istream.hpp" />
<ClInclude Include="..\..\src\build_info.hpp" />
<ClInclude Include="..\..\src\carryover.hpp" />
<ClInclude Include="..\..\src\chat_command_handler.hpp" />
@ -3985,6 +3983,7 @@
<ClInclude Include="..\..\src\editor\map\map_fragment.hpp" />
<ClInclude Include="..\..\src\editor\palette\common_palette.hpp" />
<ClInclude Include="..\..\src\editor\palette\editor_palettes.hpp" />
<ClInclude Include="..\..\src\editor\palette\empty_palette.hpp" />
<ClInclude Include="..\..\src\editor\palette\item_palette.hpp" />
<ClInclude Include="..\..\src\editor\palette\location_palette.hpp" />
<ClInclude Include="..\..\src\editor\palette\palette_manager.hpp" />
@ -4032,7 +4031,6 @@
<ClInclude Include="..\..\src\formula\variant.hpp" />
<ClInclude Include="..\..\src\game_board.hpp" />
<ClInclude Include="..\..\src\game_classification.hpp" />
<ClInclude Include="..\..\src\game_config.hpp" />
<ClInclude Include="..\..\src\game_config_manager.hpp" />
<ClInclude Include="..\..\src\game_data.hpp" />
<ClInclude Include="..\..\src\game_display.hpp" />
@ -4069,7 +4067,6 @@
<ClInclude Include="..\..\src\generators\map_create.hpp" />
<ClInclude Include="..\..\src\generators\map_generator.hpp" />
<ClInclude Include="..\..\src\generic_event.hpp" />
<ClInclude Include="..\..\src\gettext.hpp" />
<ClInclude Include="..\..\src\global.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\field-fwd.hpp" />
<ClInclude Include="..\..\src\gui\auxiliary\field.hpp" />
@ -4265,7 +4262,6 @@
<ClInclude Include="..\..\src\key.hpp" />
<ClInclude Include="..\..\src\language.hpp" />
<ClInclude Include="..\..\src\lobby_preferences.hpp" />
<ClInclude Include="..\..\src\log.hpp" />
<ClInclude Include="..\..\src\lua_jailbreak_exception.hpp" />
<ClInclude Include="..\..\src\map\exception.hpp" />
<ClInclude Include="..\..\src\map\label.hpp" />
@ -4302,7 +4298,6 @@
<ClInclude Include="..\..\src\random_new_deterministic.hpp" />
<ClInclude Include="..\..\src\random_new_synced.hpp" />
<ClInclude Include="..\..\src\recall_list_manager.hpp" />
<ClInclude Include="..\..\src\reference_counted_object.hpp" />
<ClInclude Include="..\..\src\replay.hpp" />
<ClInclude Include="..\..\src\replay_controller.hpp" />
<ClInclude Include="..\..\src\replay_helper.hpp" />
@ -4407,7 +4402,6 @@
<ClInclude Include="..\..\src\tod_manager.hpp" />
<ClInclude Include="..\..\src\tools\schema\tag.hpp" />
<ClInclude Include="..\..\src\tooltips.hpp" />
<ClInclude Include="..\..\src\tstring.hpp" />
<ClInclude Include="..\..\src\units\abilities.hpp" />
<ClInclude Include="..\..\src\units\animation.hpp" />
<ClInclude Include="..\..\src\units\animation_component.hpp" />

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

@ -1404,8 +1404,6 @@
<ClCompile Include="..\..\src\events.cpp" />
<ClCompile Include="..\..\src\fake_unit_manager.cpp" />
<ClCompile Include="..\..\src\fake_unit_ptr.cpp" />
<ClCompile Include="..\..\src\filesystem_boost.cpp" />
<ClCompile Include="..\..\src\filesystem_common.cpp" />
<ClCompile Include="..\..\src\filesystem_sdl.cpp" />
<ClCompile Include="..\..\src\floating_label.cpp" />
<ClCompile Include="..\..\src\floating_textbox.cpp" />
@ -1416,7 +1414,6 @@
<ClCompile Include="..\..\src\game_data.cpp" />
<ClCompile Include="..\..\src\game_display.cpp" />
<ClCompile Include="..\..\src\game_end_exceptions.cpp" />
<ClCompile Include="..\..\src\game_errors.cpp" />
<ClCompile Include="..\..\src\game_launcher.cpp" />
<ClCompile Include="..\..\src\game_preferences.cpp" />
<ClCompile Include="..\..\src\game_state.cpp" />
@ -2792,7 +2789,6 @@
<ClInclude Include="..\..\src\formatter.hpp" />
<ClInclude Include="..\..\src\game_board.hpp" />
<ClInclude Include="..\..\src\game_classification.hpp" />
<ClInclude Include="..\..\src\game_config.hpp" />
<ClInclude Include="..\..\src\game_config_manager.hpp" />
<ClInclude Include="..\..\src\game_data.hpp" />
<ClInclude Include="..\..\src\game_display.hpp" />
@ -2802,7 +2798,6 @@
<ClInclude Include="..\..\src\game_preferences.hpp" />
<ClInclude Include="..\..\src\game_state.hpp" />
<ClInclude Include="..\..\src\generic_event.hpp" />
<ClInclude Include="..\..\src\gettext.hpp" />
<ClInclude Include="..\..\src\global.hpp" />
<ClInclude Include="..\..\src\halo.hpp" />
<ClInclude Include="..\..\src\hash.hpp" />
@ -2813,7 +2808,6 @@
<ClInclude Include="..\..\src\key.hpp" />
<ClInclude Include="..\..\src\language.hpp" />
<ClInclude Include="..\..\src\lobby_preferences.hpp" />
<ClInclude Include="..\..\src\log.hpp" />
<ClInclude Include="..\..\src\lua_jailbreak_exception.hpp" />
<ClInclude Include="..\..\src\map_command_handler.hpp" />
<ClInclude Include="..\..\src\md5.hpp" />
@ -2844,7 +2838,6 @@
<ClInclude Include="..\..\src\random_new_deterministic.hpp" />
<ClInclude Include="..\..\src\random_new_synced.hpp" />
<ClInclude Include="..\..\src\recall_list_manager.hpp" />
<ClInclude Include="..\..\src\reference_counted_object.hpp" />
<ClInclude Include="..\..\src\replay.hpp" />
<ClInclude Include="..\..\src\replay_controller.hpp" />
<ClInclude Include="..\..\src\replay_helper.hpp" />
@ -2876,7 +2869,6 @@
<ClInclude Include="..\..\src\time_of_day.hpp" />
<ClInclude Include="..\..\src\tod_manager.hpp" />
<ClInclude Include="..\..\src\tooltips.hpp" />
<ClInclude Include="..\..\src\tstring.hpp" />
<ClInclude Include="..\..\src\util.hpp" />
<ClInclude Include="..\..\src\variable.hpp" />
<ClInclude Include="..\..\src\variable_info.hpp" />
@ -2939,6 +2931,10 @@
<ClInclude Include="..\..\src\font\pango\stream_ops.hpp">
<Filter>Font\Pango</Filter>
</ClInclude>
<ClInclude Include="..\..\src\buffered_istream.hpp" />
<ClInclude Include="..\..\src\editor\palette\empty_palette.hpp">
<Filter>Editor\Palette</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">

2
projectfiles/VC12/wesnothlib.vcxproj
View file

@ -193,8 +193,8 @@
<ClCompile Include="..\..\src\version.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\about.hpp" />
<ClInclude Include="..\..\src\color.hpp" />
<ClInclude Include="..\..\src\color_range.hpp" />
<ClInclude Include="..\..\src\config.hpp" />
<ClInclude Include="..\..\src\config_assign.hpp" />
<ClInclude Include="..\..\src\filesystem.hpp" />

1
projectfiles/VC12/wesnothlib.vcxproj.filters
View file

@ -80,7 +80,6 @@
<ClInclude Include="..\..\src\serialization\validator.hpp">
<Filter>Serialization</Filter>
</ClInclude>
<ClInclude Include="..\..\src\about.hpp" />
<ClInclude Include="..\..\src\config.hpp" />
<ClInclude Include="..\..\src\config_assign.hpp" />
<ClInclude Include="..\..\src\filesystem.hpp" />

6
projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
View file

@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
1EF6CE8214D9846D00ECBE58 /* mp_host_game_prompt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EF6CE8014D9846D00ECBE58 /* mp_host_game_prompt.cpp */; };
4944F4071354FB410027E614 /* game_errors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4944F4041354FB410027E614 /* game_errors.cpp */; };
4944F40D1354FB760027E614 /* drawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4944F40C1354FB760027E614 /* drawing.cpp */; };
4944F4121354FB970027E614 /* debug_clock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4944F40E1354FB970027E614 /* debug_clock.cpp */; };
4944F4131354FB970027E614 /* mp_login.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4944F40F1354FB970027E614 /* mp_login.cpp */; };
@ -563,7 +562,6 @@
91E3565D1CACC67C00774252 /* game_board.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFB9FA9193BFB4B00146ED0 /* game_board.cpp */; };
91E3565E1CACC67C00774252 /* game_classification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */; };
91E3565F1CACC67C00774252 /* game_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A7E0EC62181008DD061 /* game_display.cpp */; };
91E356601CACC67C00774252 /* game_errors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4944F4041354FB410027E614 /* game_errors.cpp */; };
91E356611CACC67C00774252 /* game_launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC2194471960634100420969 /* game_launcher.cpp */; };
91E356621CACC67C00774252 /* game_preferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5599A790EC62181008DD061 /* game_preferences.cpp */; };
91E356631CACC67C00774252 /* game_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC387E6A195AFB1F00FC0342 /* game_state.cpp */; };
@ -1404,7 +1402,6 @@
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
1EF6CE8014D9846D00ECBE58 /* mp_host_game_prompt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mp_host_game_prompt.cpp; sourceTree = "<group>"; };
1EF6CE8114D9846D00ECBE58 /* mp_host_game_prompt.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mp_host_game_prompt.hpp; sourceTree = "<group>"; };
4944F4041354FB410027E614 /* game_errors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_errors.cpp; sourceTree = "<group>"; };
4944F40C1354FB760027E614 /* drawing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drawing.cpp; sourceTree = "<group>"; };
4944F40E1354FB970027E614 /* debug_clock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug_clock.cpp; sourceTree = "<group>"; };
4944F40F1354FB970027E614 /* mp_login.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mp_login.cpp; sourceTree = "<group>"; };
@ -2967,7 +2964,6 @@
B5599A7D0EC62181008DD061 /* game_display.hpp */,
F419A1F314E21246002F9ADC /* game_end_exceptions.cpp */,
B52EE8AC121359A600CFBDAB /* game_end_exceptions.hpp */,
4944F4041354FB410027E614 /* game_errors.cpp */,
B5599A7C0EC62181008DD061 /* game_errors.hpp */,
62CC8E6917B9063D00C16B75 /* game_events */,
91B621A71B76A86700B00E0F /* game_initialization */,
@ -4980,7 +4976,6 @@
B5951A951013BB3400C10B66 /* game_delete.cpp in Sources */,
B5599B6A0EC62181008DD061 /* game_display.cpp in Sources */,
F419A1F414E21246002F9ADC /* game_end_exceptions.cpp in Sources */,
4944F4071354FB410027E614 /* game_errors.cpp in Sources */,
B597EBF10FC082AB00CE81F5 /* game_info.cpp in Sources */,
EC2194491960634100420969 /* game_launcher.cpp in Sources */,
B595EFE2100436C900C10B66 /* game_load.cpp in Sources */,
@ -5455,7 +5450,6 @@
91E3565D1CACC67C00774252 /* game_board.cpp in Sources */,
91E3565E1CACC67C00774252 /* game_classification.cpp in Sources */,
91E3565F1CACC67C00774252 /* game_display.cpp in Sources */,
91E356601CACC67C00774252 /* game_errors.cpp in Sources */,
91E356611CACC67C00774252 /* game_launcher.cpp in Sources */,
91E356621CACC67C00774252 /* game_preferences.cpp in Sources */,
91E356631CACC67C00774252 /* game_state.cpp in Sources */,

1
src/CMakeLists.txt
View file

@ -731,7 +731,6 @@ set(wesnoth-main_SRC
game_config_manager.cpp
game_data.cpp
game_display.cpp
game_errors.cpp
game_events/action_wml.cpp
game_events/conditional_wml.cpp
game_events/entity_location.cpp

1
src/SConscript
View file

@ -302,7 +302,6 @@ wesnoth_sources = Split("""
game_config_manager.cpp
game_data.cpp
game_display.cpp
game_errors.cpp
game_events/action_wml.cpp
game_events/conditional_wml.cpp
game_events/entity_location.cpp

15
src/game_errors.cpp
View file

@ -1,15 +0,0 @@
/*
Copyright (C) 2011 - 2016 by mark de wever <koraq@xs4all.nl>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#include "game_errors.hpp"