Merge remote-tracking branch 'aquileia/code_blocks'

Update code_blocks project files
This commit is contained in:
Chris Beck 2014-04-16 16:33:28 -04:00
commit b9cc315e5c
2 changed files with 8 additions and 50 deletions

View file

@ -7,10 +7,10 @@
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="release">
<Target title="Release">
<Option output="../../wesnoth" prefix_auto="1" extension_auto="1" />
<Option working_dir="../../" />
<Option object_output="." />
<Option object_output=".objs-release" />
<Option type="0" />
<Option compiler="gcc" />
<MakeCommands>
@ -22,10 +22,10 @@
<SilentBuild command="scons -C ../.. build=$target wesnoth" />
</MakeCommands>
</Target>
<Target title="debug">
<Target title="Debug">
<Option output="../../wesnoth-debug" prefix_auto="1" extension_auto="1" />
<Option working_dir="../../" />
<Option object_output="." />
<Option object_output=".objs-debug" />
<Option type="0" />
<Option compiler="gcc" />
<MakeCommands>
@ -964,24 +964,8 @@
<Unit filename="../../src/time_of_day.hpp" />
<Unit filename="../../src/tod_manager.cpp" />
<Unit filename="../../src/tod_manager.hpp" />
<Unit filename="../../src/tools/cutter.cpp" />
<Unit filename="../../src/tools/dummy_video.cpp" />
<Unit filename="../../src/tools/exploder_composer.cpp" />
<Unit filename="../../src/tools/exploder_composer.hpp" />
<Unit filename="../../src/tools/exploder.cpp" />
<Unit filename="../../src/tools/exploder_cutter.cpp" />
<Unit filename="../../src/tools/exploder_cutter.hpp" />
<Unit filename="../../src/tools/exploder_utils.cpp" />
<Unit filename="../../src/tools/exploder_utils.hpp" />
<Unit filename="../../src/tools/key_test.cpp" />
<Unit filename="../../src/tools/schema/error_container.cpp" />
<Unit filename="../../src/tools/schema/error_container.hpp" />
<Unit filename="../../src/tools/schema/schema_generator.cpp" />
<Unit filename="../../src/tools/schema/sourceparser.cpp" />
<Unit filename="../../src/tools/schema/sourceparser.hpp" />
<Unit filename="../../src/tools/schema/tag.cpp" />
<Unit filename="../../src/tools/schema/tag.hpp" />
<Unit filename="../../src/tools/validator/validator_tool.cpp" />
<Unit filename="../../src/tooltips.cpp" />
<Unit filename="../../src/tooltips.hpp" />
<Unit filename="../../src/tracer.cpp" />
@ -993,6 +977,7 @@
<Unit filename="../../src/unit_abilities.cpp" />
<Unit filename="../../src/unit_abilities.hpp" />
<Unit filename="../../src/unit_animation.cpp" />
<Unit filename="../../src/unit_animation.hpp" />
<Unit filename="../../src/unit_display.cpp" />
<Unit filename="../../src/unit_display.hpp" />
<Unit filename="../../src/unit_frame.cpp" />
@ -1018,13 +1003,7 @@
<Unit filename="../../src/version.hpp" />
<Unit filename="../../src/video.cpp" />
<Unit filename="../../src/video.hpp" />
<Unit filename="../../src/wesmage/exit.cpp" />
<Unit filename="../../src/wesmage/exit.hpp" />
<Unit filename="../../src/wesmage/filter.cpp" />
<Unit filename="../../src/wesmage/filter.hpp" />
<Unit filename="../../src/wesmage/options.cpp" />
<Unit filename="../../src/wesmage/options.hpp" />
<Unit filename="../../src/wesmage/wesmage.cpp" />
<Unit filename="../../src/wesconfig.h" />
<Unit filename="../../src/whiteboard/action.cpp" />
<Unit filename="../../src/whiteboard/action.hpp" />
<Unit filename="../../src/whiteboard/attack.cpp" />

View file

@ -458,6 +458,8 @@
<Unit filename="..\..\src\gui\auxiliary\widget_definition\toggle_button.hpp" />
<Unit filename="..\..\src\gui\auxiliary\widget_definition\toggle_panel.cpp" />
<Unit filename="..\..\src\gui\auxiliary\widget_definition\toggle_panel.hpp" />
<Unit filename="..\..\src\gui\auxiliary\widget_definition\tooltip.cpp" />
<Unit filename="..\..\src\gui\auxiliary\widget_definition\tooltip.hpp" />
<Unit filename="..\..\src\gui\auxiliary\widget_definition\tree_view.cpp" />
<Unit filename="..\..\src\gui\auxiliary\widget_definition\tree_view.hpp" />
<Unit filename="..\..\src\gui\auxiliary\widget_definition\vertical_scrollbar.cpp" />
@ -999,24 +1001,8 @@
<Unit filename="..\..\src\time_of_day.hpp" />
<Unit filename="..\..\src\tod_manager.cpp" />
<Unit filename="..\..\src\tod_manager.hpp" />
<Unit filename="..\..\src\tools\cutter.cpp" />
<Unit filename="..\..\src\tools\dummy_video.cpp" />
<Unit filename="..\..\src\tools\exploder_composer.cpp" />
<Unit filename="..\..\src\tools\exploder_composer.hpp" />
<Unit filename="..\..\src\tools\exploder.cpp" />
<Unit filename="..\..\src\tools\exploder_cutter.cpp" />
<Unit filename="..\..\src\tools\exploder_cutter.hpp" />
<Unit filename="..\..\src\tools\exploder_utils.cpp" />
<Unit filename="..\..\src\tools\exploder_utils.hpp" />
<Unit filename="..\..\src\tools\key_test.cpp" />
<Unit filename="..\..\src\tools\schema\error_container.cpp" />
<Unit filename="..\..\src\tools\schema\error_container.hpp" />
<Unit filename="..\..\src\tools\schema\schema_generator.cpp" />
<Unit filename="..\..\src\tools\schema\sourceparser.cpp" />
<Unit filename="..\..\src\tools\schema\sourceparser.hpp" />
<Unit filename="..\..\src\tools\schema\tag.cpp" />
<Unit filename="..\..\src\tools\schema\tag.hpp" />
<Unit filename="..\..\src\tools\validator\validator_tool.cpp" />
<Unit filename="..\..\src\tooltips.cpp" />
<Unit filename="..\..\src\tooltips.hpp" />
<Unit filename="..\..\src\tracer.cpp" />
@ -1055,13 +1041,6 @@
<Unit filename="..\..\src\video.cpp" />
<Unit filename="..\..\src\video.hpp" />
<Unit filename="..\..\src\wesconfig.h" />
<Unit filename="..\..\src\wesmage\exit.cpp" />
<Unit filename="..\..\src\wesmage\exit.hpp" />
<Unit filename="..\..\src\wesmage\filter.cpp" />
<Unit filename="..\..\src\wesmage\filter.hpp" />
<Unit filename="..\..\src\wesmage\options.cpp" />
<Unit filename="..\..\src\wesmage\options.hpp" />
<Unit filename="..\..\src\wesmage\wesmage.cpp" />
<Unit filename="..\..\src\whiteboard\action.cpp" />
<Unit filename="..\..\src\whiteboard\action.hpp" />
<Unit filename="..\..\src\whiteboard\attack.cpp" />