From ef7a24e74b88d6179db0b5f8856d9482e57f203a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Hruby=CC=81=20=28hrubymar10=29?=
 <hrubymar10@gmail.com>
Date: Sat, 11 Aug 2018 14:57:41 +0200
Subject: [PATCH] Fix CodeBlocks and Scons builds

---
 projectfiles/CodeBlocks-SCons/wesnoth.cbp  | 12 ++++++------
 projectfiles/CodeBlocks-SCons/wesnothd.cbp |  4 ++--
 projectfiles/CodeBlocks/wesnoth.cbp        | 12 ++++++------
 projectfiles/CodeBlocks/wesnothd.cbp       |  4 ++--
 source_lists/boost_unit_tests              |  2 +-
 source_lists/libwesnoth_core               |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/projectfiles/CodeBlocks-SCons/wesnoth.cbp b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
index 71fa4cdd91f92..fcb13e226ba91 100644
--- a/projectfiles/CodeBlocks-SCons/wesnoth.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnoth.cbp
@@ -720,8 +720,8 @@
 		<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_manager.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_preferences_display.cpp" />
-		<Unit filename="../../src/image.cpp" />
-		<Unit filename="../../src/image.hpp" />
+		<Unit filename="../../src/picture.cpp" />
+		<Unit filename="../../src/picture.hpp" />
 		<Unit filename="../../src/image_modifications.cpp" />
 		<Unit filename="../../src/image_modifications.hpp" />
 		<Unit filename="../../src/intro.cpp" />
@@ -919,8 +919,8 @@
 		<Unit filename="../../src/serialization/unicode.hpp" />
 		<Unit filename="../../src/serialization/validator.cpp" />
 		<Unit filename="../../src/serialization/validator.hpp" />
-		<Unit filename="../../src/settings.cpp" />
-		<Unit filename="../../src/settings.hpp" />
+		<Unit filename="../../src/map_settings.cpp" />
+		<Unit filename="../../src/map_settings.hpp" />
 		<Unit filename="../../src/sha1.cpp" />
 		<Unit filename="../../src/sha1.hpp" />
 		<Unit filename="../../src/shared_object.hpp" />
@@ -1017,8 +1017,8 @@
 		<Unit filename="../../src/variable.hpp" />
 		<Unit filename="../../src/variant.cpp" />
 		<Unit filename="../../src/variant.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/video.cpp" />
 		<Unit filename="../../src/video.hpp" />
 		<Unit filename="../../src/wesconfig.h" />
diff --git a/projectfiles/CodeBlocks-SCons/wesnothd.cbp b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
index 18434d181ae25..959846da8cfe0 100644
--- a/projectfiles/CodeBlocks-SCons/wesnothd.cbp
+++ b/projectfiles/CodeBlocks-SCons/wesnothd.cbp
@@ -107,8 +107,8 @@
 		<Unit filename="../../src/tstring.hpp" />
 		<Unit filename="../../src/util.cpp" />
 		<Unit filename="../../src/util.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/wesconfig.h" />
 		<Extensions>
 			<code_completion />
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 031eb4e68fb70..b992b6669abab 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -827,8 +827,8 @@
 		<Unit filename="../../src/hotkey/hotkey_item.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_manager.hpp" />
-		<Unit filename="../../src/image.cpp" />
-		<Unit filename="../../src/image.hpp" />
+		<Unit filename="../../src/picture.cpp" />
+		<Unit filename="../../src/picture.hpp" />
 		<Unit filename="../../src/image_modifications.cpp" />
 		<Unit filename="../../src/image_modifications.hpp" />
 		<Unit filename="../../src/joystick.cpp" />
@@ -1037,8 +1037,8 @@
 		<Unit filename="../../src/serialization/unicode.hpp" />
 		<Unit filename="../../src/serialization/validator.cpp" />
 		<Unit filename="../../src/serialization/validator.hpp" />
-		<Unit filename="../../src/settings.cpp" />
-		<Unit filename="../../src/settings.hpp" />
+		<Unit filename="../../src/map_settings.cpp" />
+		<Unit filename="../../src/map_settings.hpp" />
 		<Unit filename="../../src/show_dialog.cpp" />
 		<Unit filename="../../src/show_dialog.hpp" />
 		<Unit filename="../../src/side_filter.cpp" />
@@ -1161,8 +1161,8 @@
 		<Unit filename="../../src/variable_info.cpp" />
 		<Unit filename="../../src/variable_info.hpp" />
 		<Unit filename="../../src/variable_info_private.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/video.cpp" />
 		<Unit filename="../../src/video.hpp" />
 		<Unit filename="../../src/wesconfig.h" />
diff --git a/projectfiles/CodeBlocks/wesnothd.cbp b/projectfiles/CodeBlocks/wesnothd.cbp
index ffe860c3af5d3..750e4952c13b9 100644
--- a/projectfiles/CodeBlocks/wesnothd.cbp
+++ b/projectfiles/CodeBlocks/wesnothd.cbp
@@ -137,8 +137,8 @@
 		<Unit filename="../../src/tstring.cpp" />
 		<Unit filename="../../src/tstring.hpp" />
 		<Unit filename="../../src/util.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/wesconfig.h" />
 		<Extensions>
 			<code_completion />
diff --git a/source_lists/boost_unit_tests b/source_lists/boost_unit_tests
index 267c9aa72eabf..06be312205057 100644
--- a/source_lists/boost_unit_tests
+++ b/source_lists/boost_unit_tests
@@ -27,4 +27,4 @@ tests/test_util.cpp
 tests/test_version.cpp
 tests/test_whiteboard_side_actions.cpp
 tests/utils/fake_display.cpp
-tests/utils/game_config_manager.cpp
+tests/utils/game_config_manager_tests.cpp
diff --git a/source_lists/libwesnoth_core b/source_lists/libwesnoth_core
index 87df6fe2b50df..7b7da7aea97f6 100644
--- a/source_lists/libwesnoth_core
+++ b/source_lists/libwesnoth_core
@@ -27,4 +27,4 @@ serialization/unicode.cpp
 serialization/validator.cpp
 terrain/type_data.cpp
 tstring.cpp
-version.cpp
+game_version.cpp