Attempt to fix Travis, part II

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

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

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"

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"

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 <SDL_timer.h>
 #include <SDL_video.h>

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 {
 

src/floating_label.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "sdl/color.hpp"
+#include "color.hpp"
 #include "sdl/utils.hpp"
 #include <string>
 

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;

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 <string>
 

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 {
 

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"
 

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 <iomanip>
 

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 <SDL_ttf.h>
 

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 <boost/math/constants/constants.hpp>
 using namespace boost::math::constants;

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 <vector>

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"

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"
 

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
 {

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"
 

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"

src/gui/widgets/helper.hpp

@@ -17,7 +17,7 @@
 
 #include "font/text.hpp"
 #include "global.hpp"
-#include "sdl/color.hpp"
+#include "color.hpp"
 
 #include <pango/pango-layout.h>
 

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 <string>
 

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 <cassert>                     // for assert
 #include <algorithm>                    // for sort, find, transform, etc

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 <map>

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"
 

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"
 

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 <map>

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"

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"

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"

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

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"

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 <SDL.h>

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"

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"

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"

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"
 

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"

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