From 05127581cba0754a70ebee8de8ef92c7083e160c Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Thu, 1 Dec 2016 00:27:14 -0500 Subject: [PATCH] Attempt to fix Travis, part II --- src/CMakeLists.txt | 2 +- src/SConscript | 2 +- src/ai/formula/function_table.cpp | 2 +- src/display.cpp | 2 +- src/display_chat_manager.cpp | 2 +- src/editor/action/mouse/mouse_action_map_label.cpp | 2 +- src/floating_label.hpp | 2 +- src/font/marked-up_text.hpp | 2 +- src/font/sdl_ttf.hpp | 2 +- src/font/standard_colors.hpp | 2 +- src/font/text.hpp | 2 +- src/font/text_formatting.cpp | 2 +- src/font/text_surface.hpp | 2 +- src/formula/function.cpp | 2 +- src/game_config.hpp | 2 +- src/game_display.cpp | 2 +- src/gui/core/window_builder.hpp | 2 +- src/gui/dialogs/editor/edit_label.hpp | 2 +- src/gui/dialogs/unit_attack.cpp | 2 +- src/gui/widgets/helper.cpp | 2 +- src/gui/widgets/helper.hpp | 2 +- src/gui/widgets/widget.hpp | 2 +- src/help/help_impl.cpp | 2 +- src/image_modifications.cpp | 2 +- src/intro.cpp | 2 +- src/map/label.cpp | 2 +- src/map/label.hpp | 2 +- src/menu_events.cpp | 2 +- src/minimap.cpp | 2 +- src/reports.cpp | 2 +- src/scripting/game_lua_kernel.cpp | 2 +- src/sdl/utils.cpp | 2 +- src/sdl/utils.hpp | 2 +- src/team.cpp | 2 +- src/units/animation.cpp | 2 +- src/units/drawer.cpp | 2 +- src/units/frame.cpp | 2 +- src/units/udisplay.cpp | 2 +- src/units/unit.cpp | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39e07aafa844f..4997830e67c07 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -209,6 +209,7 @@ endif(ENABLE_SHARED_LIBRARIES) set(libwesnoth-core_STAT_SRC color_range.cpp + color.cpp config.cpp filesystem_boost.cpp filesystem_common.cpp @@ -363,7 +364,6 @@ set_target_properties(wesnoth-lua ########### Helper libraries ############### set(wesnoth-sdl_SRC - sdl/color.cpp sdl/exception.cpp sdl/rect.cpp sdl/window.cpp diff --git a/src/SConscript b/src/SConscript index d804f9d2f2a41..2e1c2e897506c 100644 --- a/src/SConscript +++ b/src/SConscript @@ -19,6 +19,7 @@ for env in [test_env, client_env, env]: libwesnoth_core_sources = Split(""" color_range.cpp + color.cpp config.cpp font/constants.cpp hash.cpp @@ -160,7 +161,6 @@ libcampaignd_sources = Split(""" libcampaignd = env.Library("campaignd", libcampaignd_sources, OBJPREFIX = "campaignd_") libwesnoth_sdl_sources = Split(""" - sdl/color.cpp sdl/exception.cpp sdl/rect.cpp sdl/utils.cpp diff --git a/src/ai/formula/function_table.cpp b/src/ai/formula/function_table.cpp index 33674c6bcc99c..a9b3d9c8b0f90 100644 --- a/src/ai/formula/function_table.cpp +++ b/src/ai/formula/function_table.cpp @@ -33,7 +33,7 @@ #include "pathfind/teleport.hpp" #include "replay.hpp" #include "resources.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "terrain/filter.hpp" #include "units/unit.hpp" #include "pathfind/pathfind.hpp" diff --git a/src/display.cpp b/src/display.cpp index 05dd37c150ad3..13a244a1a91cd 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -37,7 +37,7 @@ #include "play_controller.hpp" //note: this can probably be refactored out #include "reports.hpp" #include "resources.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "synced_context.hpp" #include "team.hpp" #include "terrain/builder.hpp" diff --git a/src/display_chat_manager.cpp b/src/display_chat_manager.cpp index 709705dcfa4a6..3a5a79d67a5ac 100644 --- a/src/display_chat_manager.cpp +++ b/src/display_chat_manager.cpp @@ -24,7 +24,7 @@ #include "font/marked-up_text.hpp" #include "mp_ui_alerts.hpp" #include "serialization/string_utils.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include #include diff --git a/src/editor/action/mouse/mouse_action_map_label.cpp b/src/editor/action/mouse/mouse_action_map_label.cpp index 11820965ec491..18b21fb370537 100644 --- a/src/editor/action/mouse/mouse_action_map_label.cpp +++ b/src/editor/action/mouse/mouse_action_map_label.cpp @@ -24,7 +24,7 @@ #include "gui/dialogs/editor/edit_label.hpp" #include "font/standard_colors.hpp" -#include "sdl/color.hpp" +#include "color.hpp" namespace editor { diff --git a/src/floating_label.hpp b/src/floating_label.hpp index d3f7dfa3cf1cb..8c994136c1b41 100644 --- a/src/floating_label.hpp +++ b/src/floating_label.hpp @@ -14,7 +14,7 @@ #pragma once -#include "sdl/color.hpp" +#include "color.hpp" #include "sdl/utils.hpp" #include diff --git a/src/font/marked-up_text.hpp b/src/font/marked-up_text.hpp index 093f171689102..47f2b9a07b72f 100644 --- a/src/font/marked-up_text.hpp +++ b/src/font/marked-up_text.hpp @@ -17,7 +17,7 @@ #ifndef MARKED_UP_TEXT_HPP_INCLUDED #define MARKED_UP_TEXT_HPP_INCLUDED -#include "sdl/color.hpp" +#include "color.hpp" class CVideo; class surface; diff --git a/src/font/sdl_ttf.hpp b/src/font/sdl_ttf.hpp index 700c3312aa1ea..00b9fe9da2228 100644 --- a/src/font/sdl_ttf.hpp +++ b/src/font/sdl_ttf.hpp @@ -18,7 +18,7 @@ #include "constants.hpp" #include "font_id.hpp" #include "font_description.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include diff --git a/src/font/standard_colors.hpp b/src/font/standard_colors.hpp index e2b1444984f2d..787b786ced3a7 100644 --- a/src/font/standard_colors.hpp +++ b/src/font/standard_colors.hpp @@ -15,7 +15,7 @@ #ifndef FONT_STANDARD_COLORS_HPP #define FONT_STANDARD_COLORS_HPP -#include "sdl/color.hpp" +#include "color.hpp" namespace font { diff --git a/src/font/text.hpp b/src/font/text.hpp index 3f63750a8d95b..aa00688015fcb 100644 --- a/src/font/text.hpp +++ b/src/font/text.hpp @@ -16,7 +16,7 @@ #define TEXT_HPP_INCLUDED #include "font/font_options.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sdl/utils.hpp" #include "serialization/unicode_types.hpp" diff --git a/src/font/text_formatting.cpp b/src/font/text_formatting.cpp index a6185722f50d5..cd37cc0ffe61b 100644 --- a/src/font/text_formatting.cpp +++ b/src/font/text_formatting.cpp @@ -16,7 +16,7 @@ #include "formatter.hpp" #include "game_config.hpp" #include "gettext.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include diff --git a/src/font/text_surface.hpp b/src/font/text_surface.hpp index 4d17cb0beee25..8ddbfd71a2eb4 100644 --- a/src/font/text_surface.hpp +++ b/src/font/text_surface.hpp @@ -16,7 +16,7 @@ #define FONT_TEXT_SURFACE_HPP #include "font_id.hpp" // for text_chunk -#include "sdl/color.hpp" +#include "color.hpp" #include diff --git a/src/formula/function.cpp b/src/formula/function.cpp index 6a80bc68b8796..fce876c11bd07 100644 --- a/src/formula/function.cpp +++ b/src/formula/function.cpp @@ -21,7 +21,7 @@ #include "game_display.hpp" #include "game_config.hpp" #include "log.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include using namespace boost::math::constants; diff --git a/src/game_config.hpp b/src/game_config.hpp index 0a6198902085f..75a8631c98cd0 100644 --- a/src/game_config.hpp +++ b/src/game_config.hpp @@ -18,7 +18,7 @@ class config; class version_info; class color_range; -#include "sdl/color.hpp" +#include "color.hpp" #include "tstring.hpp" #include diff --git a/src/game_display.cpp b/src/game_display.cpp index 49b8a0db511fe..791b207415953 100644 --- a/src/game_display.cpp +++ b/src/game_display.cpp @@ -39,7 +39,7 @@ #include "reports.hpp" #include "resources.hpp" #include "tod_manager.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sound.hpp" #include "synced_context.hpp" #include "terrain/type_data.hpp" diff --git a/src/gui/core/window_builder.hpp b/src/gui/core/window_builder.hpp index 30e378598950c..1d800c96a8a55 100644 --- a/src/gui/core/window_builder.hpp +++ b/src/gui/core/window_builder.hpp @@ -17,7 +17,7 @@ #include "gui/auxiliary/typed_formula.hpp" #include "gui/widgets/grid.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "utils/functional.hpp" diff --git a/src/gui/dialogs/editor/edit_label.hpp b/src/gui/dialogs/editor/edit_label.hpp index 8db375aef70a8..1c58b287c1903 100644 --- a/src/gui/dialogs/editor/edit_label.hpp +++ b/src/gui/dialogs/editor/edit_label.hpp @@ -17,7 +17,7 @@ #include "gui/dialogs/modal_dialog.hpp" #include "map/label.hpp" -#include "sdl/color.hpp" +#include "color.hpp" namespace gui2 { diff --git a/src/gui/dialogs/unit_attack.cpp b/src/gui/dialogs/unit_attack.cpp index 7ebfc5dc2b0f0..b96e1ad9d4dfb 100644 --- a/src/gui/dialogs/unit_attack.cpp +++ b/src/gui/dialogs/unit_attack.cpp @@ -38,7 +38,7 @@ #include "language.hpp" #include "font/marked-up_text.hpp" #include "resources.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "team.hpp" #include "units/unit.hpp" diff --git a/src/gui/widgets/helper.cpp b/src/gui/widgets/helper.cpp index 9884e15ac1e92..42a18811a4568 100644 --- a/src/gui/widgets/helper.cpp +++ b/src/gui/widgets/helper.cpp @@ -19,7 +19,7 @@ #include "gui/core/log.hpp" #include "gui/core/point.hpp" #include "gui/widgets/settings.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sdl/rect.hpp" #include "formula/callable.hpp" #include "formula/string_utils.hpp" diff --git a/src/gui/widgets/helper.hpp b/src/gui/widgets/helper.hpp index 6bb0942003060..25f363f1538a0 100644 --- a/src/gui/widgets/helper.hpp +++ b/src/gui/widgets/helper.hpp @@ -17,7 +17,7 @@ #include "font/text.hpp" #include "global.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include diff --git a/src/gui/widgets/widget.hpp b/src/gui/widgets/widget.hpp index 626654a394a02..80d3122dad470 100644 --- a/src/gui/widgets/widget.hpp +++ b/src/gui/widgets/widget.hpp @@ -18,7 +18,7 @@ #include "gui/core/event/dispatcher.hpp" #include "gui/core/point.hpp" #include "gui/widgets/event_executor.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include diff --git a/src/help/help_impl.cpp b/src/help/help_impl.cpp index 071a5f9c0ded6..91257e8da0d73 100644 --- a/src/help/help_impl.cpp +++ b/src/help/help_impl.cpp @@ -43,7 +43,7 @@ #include "tstring.hpp" // for t_string, operator<< #include "units/types.hpp" // for unit_type, unit_type_data, etc #include "serialization/unicode.hpp" // for iterator -#include "sdl/color.hpp" +#include "color.hpp" #include // for assert #include // for sort, find, transform, etc diff --git a/src/image_modifications.cpp b/src/image_modifications.cpp index 0c102b05cc8ca..ca29f2af28c27 100644 --- a/src/image_modifications.cpp +++ b/src/image_modifications.cpp @@ -19,7 +19,7 @@ #include "image.hpp" #include "image_modifications.hpp" #include "log.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "serialization/string_utils.hpp" #include diff --git a/src/intro.cpp b/src/intro.cpp index 26b090d77b8e8..997bb48c76300 100644 --- a/src/intro.cpp +++ b/src/intro.cpp @@ -25,7 +25,7 @@ #include "video.hpp" #include "gettext.hpp" #include "font/marked-up_text.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sdl/rect.hpp" #include "font/sdl_ttf.hpp" diff --git a/src/map/label.cpp b/src/map/label.cpp index f20c3dfbd9d40..a70d2a23f4651 100644 --- a/src/map/label.cpp +++ b/src/map/label.cpp @@ -20,7 +20,7 @@ #include "game_data.hpp" #include "map/label.hpp" #include "resources.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "tooltips.hpp" #include "formula/string_utils.hpp" diff --git a/src/map/label.hpp b/src/map/label.hpp index f358ec6143c15..29beca7e1878c 100644 --- a/src/map/label.hpp +++ b/src/map/label.hpp @@ -17,7 +17,7 @@ #include "font/standard_colors.hpp" #include "map/location.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "tstring.hpp" #include diff --git a/src/menu_events.cpp b/src/menu_events.cpp index fde165e703138..9d1919bf06c30 100644 --- a/src/menu_events.cpp +++ b/src/menu_events.cpp @@ -81,7 +81,7 @@ #include "scripting/game_lua_kernel.hpp" #include "scripting/plugins/manager.hpp" #include "sound.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "synced_context.hpp" #include "terrain/builder.hpp" #include "units/unit.hpp" diff --git a/src/minimap.cpp b/src/minimap.cpp index da466d0c98a7c..00647a57e1295 100644 --- a/src/minimap.cpp +++ b/src/minimap.cpp @@ -23,7 +23,7 @@ #include "log.hpp" #include "map/map.hpp" #include "resources.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sdl/utils.hpp" #include "team.hpp" #include "terrain/type_data.hpp" diff --git a/src/reports.cpp b/src/reports.cpp index bfd8c9f62e735..0dc5543d158fd 100644 --- a/src/reports.cpp +++ b/src/reports.cpp @@ -28,7 +28,7 @@ #include "font/marked-up_text.hpp" #include "mouse_events.hpp" #include "reports.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "strftime.hpp" #include "team.hpp" #include "tod_manager.hpp" diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index fcf3cae208ea3..753071c026b22 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -82,7 +82,7 @@ #include "scripting/lua_team.hpp" #include "scripting/lua_unit_type.hpp" #include "scripting/push_check.hpp" -#include "sdl/color.hpp" // for surface +#include "color.hpp" // for surface #include "sdl/utils.hpp" // for surface #include "side_filter.hpp" // for side_filter #include "sound.hpp" // for commit_music_changes, etc diff --git a/src/sdl/utils.cpp b/src/sdl/utils.cpp index 9f4a5fef43257..62a283088d90a 100644 --- a/src/sdl/utils.cpp +++ b/src/sdl/utils.cpp @@ -22,7 +22,7 @@ #include "sdl/utils.hpp" #include "sdl/rect.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "serialization/string_utils.hpp" #include "video.hpp" diff --git a/src/sdl/utils.hpp b/src/sdl/utils.hpp index a50c39afe0ab5..45ccfe6d17c30 100644 --- a/src/sdl/utils.hpp +++ b/src/sdl/utils.hpp @@ -17,7 +17,7 @@ #ifndef SDL_UTILS_INCLUDED #define SDL_UTILS_INCLUDED -#include "sdl/color.hpp" +#include "color.hpp" #include "util.hpp" #include diff --git a/src/team.cpp b/src/team.cpp index 738e813331329..41eb90ecc07b1 100644 --- a/src/team.cpp +++ b/src/team.cpp @@ -29,7 +29,7 @@ #include "resources.hpp" #include "play_controller.hpp" #include "game_preferences.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "units/types.hpp" #include "synced_context.hpp" #include "whiteboard/side_actions.hpp" diff --git a/src/units/animation.cpp b/src/units/animation.cpp index d8633522c9ae0..86de0c9e2f522 100644 --- a/src/units/animation.cpp +++ b/src/units/animation.cpp @@ -21,7 +21,7 @@ #include "map/map.hpp" #include "play_controller.hpp" #include "resources.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "units/unit.hpp" #include "units/animation_component.hpp" #include "units/filter.hpp" diff --git a/src/units/drawer.cpp b/src/units/drawer.cpp index d18f22e94118d..e525a470aed77 100644 --- a/src/units/drawer.cpp +++ b/src/units/drawer.cpp @@ -21,7 +21,7 @@ #include "halo.hpp" #include "map/map.hpp" #include "map/location.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sdl/utils.hpp" #include "team.hpp" #include "units/unit.hpp" diff --git a/src/units/frame.cpp b/src/units/frame.cpp index c97152b594b00..7e1462d53c9ca 100644 --- a/src/units/frame.cpp +++ b/src/units/frame.cpp @@ -18,7 +18,7 @@ #include "game_display.hpp" #include "log.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sound.hpp" #include "units/frame.hpp" diff --git a/src/units/udisplay.cpp b/src/units/udisplay.cpp index 63692369cc11c..af736c2b722af 100644 --- a/src/units/udisplay.cpp +++ b/src/units/udisplay.cpp @@ -25,7 +25,7 @@ #include "log.hpp" #include "mouse_events.hpp" #include "resources.hpp" -#include "sdl/color.hpp" +#include "color.hpp" #include "sound.hpp" #include "terrain/filter.hpp" #include "units/unit.hpp" diff --git a/src/units/unit.cpp b/src/units/unit.cpp index 1679c270a7c3a..184692d062f4b 100644 --- a/src/units/unit.cpp +++ b/src/units/unit.cpp @@ -36,7 +36,7 @@ #include "random_new.hpp" // for generator, rng #include "resources.hpp" // for units, gameboard, teams, etc #include "scripting/game_lua_kernel.hpp" // for game_lua_kernel -#include "sdl/color.hpp" +#include "color.hpp" #include "synced_context.hpp" #include "side_filter.hpp" // for side_filter #include "team.hpp" // for team, get_teams, etc