Prepend 'SDL2/' to all SDL includes

This was needed to get the build working with vcpkg's version of SDL, where all the SDL files are in their own SDL folder. However, our cmake config also has a note saying it was a deliberate choice to move our SDL files *out* of their SDL2 folder due to certain distros (FreeBSD is mentioned) not putting the files in said folder in the first place.
wesnoth · Jul 22, 2019 · 2470984 · 2470984
1 parent 7ebc663
commit 2470984
Show file tree

Hide file tree

Showing 70 changed files with 129 additions and 129 deletions.
diff --git a/src/ai/default/ca.cpp b/src/ai/default/ca.cpp
@@ -37,7 +37,7 @@
 #include <numeric>
 #include <boost/dynamic_bitset.hpp>
 
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 static lg::log_domain log_ai_testing_ai_default("ai/ca/testing_ai_default");
 #define DBG_AI_TESTING_AI_DEFAULT LOG_STREAM(debug, log_ai_testing_ai_default)

diff --git a/src/ai/manager.cpp b/src/ai/manager.cpp
@@ -49,7 +49,7 @@
 #include <utility>                      // for pair, make_pair
 #include <vector>                       // for vector, allocator, etc
 
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 namespace ai {
 

diff --git a/src/animated.cpp b/src/animated.cpp
@@ -19,7 +19,7 @@
 
 #include "animated.hpp"
 
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 // Put these here to ensure that there's only
 // one instance of the current_ticks variable

diff --git a/src/build_info.cpp b/src/build_info.cpp
@@ -26,10 +26,10 @@
 
 #include <algorithm>
 
-#include <SDL.h>
-#include <SDL_image.h>
-#include <SDL_mixer.h>
-#include <SDL_ttf.h>
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_image.h>
+#include <SDL2/SDL_mixer.h>
+#include <SDL2/SDL_ttf.h>
 
 #include <boost/version.hpp>
 

diff --git a/src/config_cache.cpp b/src/config_cache.cpp
@@ -27,7 +27,7 @@
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
-#include <SDL_platform.h>
+#include <SDL2/SDL_platform.h>
 
 static lg::log_domain log_cache("cache");
 #define ERR_CACHE LOG_STREAM(err, log_cache)

diff --git a/src/countdown_clock.hpp b/src/countdown_clock.hpp
@@ -13,7 +13,7 @@
 
 #pragma once
 #include "events.hpp"
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 class team;
 class countdown_clock : public events::pump_monitor

diff --git a/src/desktop/clipboard.cpp b/src/desktop/clipboard.cpp
@@ -18,8 +18,8 @@
 #include "serialization/unicode.hpp"
 #include <algorithm>
 
-#include <SDL_events.h>
-#include <SDL_clipboard.h>
+#include <SDL2/SDL_events.h>
+#include <SDL2/SDL_clipboard.h>
 
 #define CLIPBOARD_FUNCS_DEFINED
 

diff --git a/src/desktop/windows_tray_notification.cpp b/src/desktop/windows_tray_notification.cpp
@@ -14,7 +14,7 @@
 
 #include "desktop/windows_tray_notification.hpp"
 
-#include <SDL_syswm.h>
+#include <SDL2/SDL_syswm.h>
 
 #include "gettext.hpp"
 #include "serialization/string_utils.hpp"

diff --git a/src/desktop/windows_tray_notification.hpp b/src/desktop/windows_tray_notification.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <string>
 //forces to call Unicode winapi functions instead of ASCII (default)
 #ifndef UNICODE

diff --git a/src/display.cpp b/src/display.cpp
@@ -51,7 +51,7 @@
 #include "show_dialog.hpp"
 #include "gui/dialogs/loading_screen.hpp"
 
-#include <SDL_image.h>
+#include <SDL2/SDL_image.h>
 
 #include <algorithm>
 #include <array>

diff --git a/src/display_chat_manager.cpp b/src/display_chat_manager.cpp
@@ -27,7 +27,7 @@
 #include "preferences/credentials.hpp"
 #include "serialization/utf8_exception.hpp"
 
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)
@@ -194,7 +194,7 @@ void display_chat_manager::prune_chat_messages(bool remove_all)
 	const unsigned message_aging = preferences::chat_message_aging();
 	const unsigned max_chat_messages = preferences::chat_lines();
 	const bool enable_aging = message_aging != 0;
-	
+
 	const unsigned remove_before = enable_aging ? safe_subtract(SDL_GetTicks(), message_aging * 60 * 1000) : 0;
 	int movement = 0;
 

diff --git a/src/events.cpp b/src/events.cpp
@@ -33,7 +33,7 @@
 #include <vector>
 #include <thread>
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 
@@ -520,7 +520,7 @@ void pump()
 				if(event.motion.state & SDL_BUTTON(SDL_BUTTON_RIGHT))
 				{
 					SDL_Rect r = CVideo::get_singleton().screen_area();
-					
+
 					// TODO: Check if SDL_FINGERMOTION is actually signaled for COMPLETE motions (I doubt, but tbs)
 					SDL_Event touch_event;
 					touch_event.type = SDL_FINGERMOTION;
@@ -534,7 +534,7 @@ void pump()
 					touch_event.tfinger.y = static_cast<float>(event.motion.y) / r.h;
 					touch_event.tfinger.pressure = 1;
 					::SDL_PushEvent(&touch_event);
-					
+
 					event.motion.state = SDL_BUTTON(SDL_BUTTON_LEFT);
 					event.motion.which = SDL_TOUCH_MOUSEID;
 				}
@@ -545,7 +545,7 @@ void pump()
 				{
 					event.button.button = SDL_BUTTON_LEFT;
 					event.button.which = SDL_TOUCH_MOUSEID;
-					
+
 					SDL_Rect r = CVideo::get_singleton().screen_area();
 					SDL_Event touch_event;
 					touch_event.type = (event.type == SDL_MOUSEBUTTONDOWN) ? SDL_FINGERDOWN : SDL_FINGERUP;

diff --git a/src/events.hpp b/src/events.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <SDL_events.h>
+#include <SDL2/SDL_events.h>
 #include <vector>
 #include <list>
 #include <functional>

diff --git a/src/filesystem.cpp b/src/filesystem.cpp
@@ -58,7 +58,7 @@
 #if defined(__APPLE__) && defined(__MACH__) && defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
 
 #define WESNOTH_BOOST_OS_IOS (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000)
-#include <SDL_filesystem.h>
+#include <SDL2/SDL_filesystem.h>
 
 #endif
 
@@ -555,13 +555,13 @@ static const std::string& get_version_path_suffix()
 	{
 		const char* home_str = getenv("HOME");
 		bfs::path home = home_str ? home_str : ".";
-		
+
 		// We don't know which of the two is in PREFERENCES_DIR now.
 		boost::filesystem::path old_saves_dir = home / "Library/Application Support/Wesnoth_";
 		old_saves_dir += get_version_path_suffix();
 		boost::filesystem::path new_saves_dir = home / "Library/Containers/org.wesnoth.Wesnoth/Data/Library/Application Support/Wesnoth_";
 		new_saves_dir += get_version_path_suffix();
-		
+
 		if(bfs::is_directory(new_saves_dir)) {
 			if(!bfs::exists(old_saves_dir)) {
 				std::cout << "Apple developer's userdata migration: ";
@@ -582,7 +582,7 @@ static void setup_user_data_dir()
 #if defined(__APPLE__) && !defined(__IPHONEOS__)
 	migrate_apple_config_directory_for_unsandboxed_builds();
 #endif
-	
+
 	if(!create_directory_if_missing_recursive(user_data_dir)) {
 		ERR_FS << "could not open or create user data directory at " << user_data_dir.string() << '\n';
 		return;

diff --git a/src/filesystem_sdl.cpp b/src/filesystem_sdl.cpp
@@ -11,8 +11,8 @@
    See the COPYING file for more details.
 */
 
-#include <SDL.h>
-#include <SDL_rwops.h>
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_rwops.h>
 
 #include "filesystem.hpp"
 #include "log.hpp"

diff --git a/src/font/font_id.hpp b/src/font/font_id.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <tuple>
 
-#include <SDL_ttf.h>
+#include <SDL2/SDL_ttf.h>
 
 /***
  * Note: This is specific to SDL_TTF code path

diff --git a/src/font/marked-up_text.hpp b/src/font/marked-up_text.hpp
@@ -23,7 +23,7 @@ class surface;
 
 #include <string>
 
-#include <SDL_rect.h>
+#include <SDL2/SDL_rect.h>
 
 namespace font {
 

diff --git a/src/font/sdl_ttf.cpp b/src/font/sdl_ttf.cpp
@@ -31,7 +31,7 @@
 #include "sdl/surface.hpp"
 #include "serialization/unicode.hpp"
 
-#include <SDL_ttf.h>
+#include <SDL2/SDL_ttf.h>
 
 #include <map>
 #include <string>

diff --git a/src/font/sdl_ttf.hpp b/src/font/sdl_ttf.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <SDL_ttf.h>
+#include <SDL2/SDL_ttf.h>
 
 class surface;
 

diff --git a/src/font/text_surface.cpp b/src/font/text_surface.cpp
@@ -20,7 +20,7 @@
 
 #include "log.hpp"
 
-#include <SDL_ttf.h>
+#include <SDL2/SDL_ttf.h>
 
 #include <string>
 #include <vector>

diff --git a/src/font/text_surface.hpp b/src/font/text_surface.hpp
@@ -17,7 +17,7 @@
 #include "font_id.hpp" // for text_chunk
 #include "color.hpp"
 
-#include <SDL_ttf.h>
+#include <SDL2/SDL_ttf.h>
 
 #include <string>
 #include <vector>

diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp
@@ -67,7 +67,7 @@
 #include <iostream>                     // for operator<<, basic_ostream, etc
 #include <new>
 #include <utility>                      // for pair
-#include <SDL.h>                        // for SDL_INIT_JOYSTICK, etc
+#include <SDL2/SDL.h>                        // for SDL_INIT_JOYSTICK, etc
 
 #ifdef DEBUG_WINDOW_LAYOUT_GRAPHS
 #include "gui/widgets/debug.hpp"

diff --git a/src/game_state.cpp b/src/game_state.cpp
@@ -33,7 +33,7 @@
 #include "gui/dialogs/loading_screen.hpp"
 
 #include "utils/functional.hpp"
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 #include <algorithm>
 #include <set>

diff --git a/src/generators/default_map_generator_job.cpp b/src/generators/default_map_generator_job.cpp
@@ -31,7 +31,7 @@
 #include "seed_rng.hpp"
 #include "wml_exception.hpp"
 
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 static lg::log_domain log_mapgen("mapgen");
 #define ERR_NG LOG_STREAM(err, log_mapgen)
@@ -696,9 +696,9 @@ static void flood_name(const map_location& start, const std::string& name, std::
 std::string default_map_generator_job::default_generate_map(generator_data data, std::map<map_location,std::string>* labels, const config& cfg)
 {
 	log_scope("map generation");
-	
-	LOG_NG << "default_generate_map parameters" 
-		<< " width=" << data.width 
+
+	LOG_NG << "default_generate_map parameters"
+		<< " width=" << data.width
 		<< " height=" << data.height
 		<< " nplayers=" << data.nplayers
 		<< " nvillages=" << data.nvillages

diff --git a/src/gui/core/event/dispatcher.hpp b/src/gui/core/event/dispatcher.hpp
@@ -19,7 +19,7 @@
 
 #include "utils/functional.hpp"
 
-#include <SDL_events.h>
+#include <SDL2/SDL_events.h>
 
 #include <boost/mpl/int.hpp>
 
@@ -251,8 +251,8 @@ class dispatcher
 			  widget& target,
 			  const point& pos,
 			  const point& distance);
-	
-	
+
+
 	/**
 	 * Fires an event which takes touch-gesture parameters.
 	 *
@@ -269,7 +269,7 @@ class dispatcher
 			  float dTheta,
 			  float dDist,
 			  Uint8 numFingers);
-	
+
 
 	/**
 	 * Fires an event which takes notification parameters.

diff --git a/src/gui/core/event/dispatcher_private.hpp b/src/gui/core/event/dispatcher_private.hpp
@@ -18,7 +18,7 @@
 
 #include "gui/widgets/widget.hpp"
 
-#include <SDL_events.h>
+#include <SDL2/SDL_events.h>
 
 #include <boost/mpl/for_each.hpp>
 #include <boost/range/adaptor/reversed.hpp>

diff --git a/src/gui/core/timer.cpp b/src/gui/core/timer.cpp
@@ -17,7 +17,7 @@
 #include "events.hpp"
 #include "gui/core/log.hpp"
 
-#include <SDL_timer.h>
+#include <SDL2/SDL_timer.h>
 
 #include <map>
 #include <mutex>
@@ -45,7 +45,7 @@ static std::map<std::size_t, timer>& get_timers()
 	static std::map<std::size_t, timer>* ptimers = new std::map<std::size_t, timer>();
 	return *ptimers;
 }
-/** 
+/**
 	The id of the event being executed, 0 if none.
 	NOTE: it is possible that multiple timers are executed at the same time
 	      if one of the timer starts an event loop for example if its handler

diff --git a/src/gui/core/timer.hpp b/src/gui/core/timer.hpp
@@ -31,7 +31,7 @@
 
 #include "utils/functional.hpp"
 
-#include <SDL_types.h>
+#include <SDL2/SDL_types.h>
 
 namespace gui2
 {

diff --git a/src/gui/dialogs/end_credits.hpp b/src/gui/dialogs/end_credits.hpp
@@ -15,7 +15,7 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-#include <SDL_keycode.h>
+#include <SDL2/SDL_keycode.h>
 #include <vector>
 
 class display;

diff --git a/src/gui/dialogs/game_load.hpp b/src/gui/dialogs/game_load.hpp
@@ -20,7 +20,7 @@
 #include "save_index.hpp"
 #include "gettext.hpp"
 
-#include <SDL_keycode.h>
+#include <SDL2/SDL_keycode.h>
 
 namespace gui2
 {

diff --git a/src/gui/dialogs/hotkey_bind.cpp b/src/gui/dialogs/hotkey_bind.cpp
@@ -18,7 +18,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 namespace gui2
 {