Use SDL2 include files instead of those for SDL version 1.

This resolves an irritating issue in the code editor where SDL2-specific functions could't be found. Not entirely sure about the SDL include file logic for other operating systems than Linux so the #ifdef directives may need to be updated further at a later date.

es-app/src/guis/GuiInfoPopup.cpp

@@ -9,7 +9,12 @@
 #include "components/ComponentGrid.h"
 #include "components/NinePatchComponent.h"
 #include "components/TextComponent.h"
-#include <SDL_timer.h>
+
+#ifdef __linux__
+#include <SDL2/SDL_timer.h>
+#else
+#include "SDL_timer.h"
+#endif
 
 GuiInfoPopup::GuiInfoPopup(
         Window* window,

es-app/src/guis/GuiMenu.cpp

@@ -25,9 +25,15 @@
 #include "Scripting.h"
 #include "SystemData.h"
 #include "VolumeControl.h"
-#include <SDL_events.h>
+
 #include <algorithm>
 
+#ifdef __linux__
+#include <SDL2/SDL_events.h>
+#else
+#include "SDL_events.h"
+#endif
+
 GuiMenu::GuiMenu(
         Window* window)
         : GuiComponent(window),

es-app/src/main.cpp

@@ -30,10 +30,18 @@
 #include "Settings.h"
 #include "SystemData.h"
 #include "SystemScreenSaver.h"
+
+#ifdef __linux__
+#include <SDL2/SDL_events.h>
+#include <SDL2/SDL_main.h>
+#include <SDL2/SDL_timer.h>
+#else
+#include "SDL_events.h"
+#include "SDL_main.h"
+#include "SDL_timer.h"
+#endif
+
 #include <FreeImage.h>
-#include <SDL_events.h>
-#include <SDL_main.h>
-#include <SDL_timer.h>
 #include <iostream>
 #include <time.h>
 #ifdef WIN32

es-core/src/AudioManager.cpp

@@ -7,9 +7,9 @@
 #include "AudioManager.h"
 
 #include "Log.h"
+#include "SDL.h"
 #include "Settings.h"
 #include "Sound.h"
-#include <SDL.h>
 
 std::vector<std::shared_ptr<Sound>> AudioManager::sSoundVector;
 SDL_AudioSpec AudioManager::sAudioFormat;

es-core/src/AudioManager.h

@@ -8,7 +8,12 @@
 #ifndef ES_CORE_AUDIO_MANAGER_H
 #define ES_CORE_AUDIO_MANAGER_H
 
-#include <SDL_audio.h>
+#ifdef __linux__
+#include <SDL2/SDL_audio.h>
+#else
+#include "SDL_audio.h"
+#endif
+
 #include <memory>
 #include <vector>
 

es-core/src/CECInput.cpp

@@ -12,7 +12,13 @@
 #include <iostream> // Bad bad cecloader.
 #include <libcec/cec.h>
 #include <libcec/cecloader.h>
-#include <SDL_events.h>
+
+#ifdef __linux__
+#include <SDL2/SDL_events.h>
+#else
+#include "SDL_events.h"
+#endif // __linux__
+
 #ifdef _RPI_
 extern "C" {
 #include <interface/vmcs_host/vc_cecservice.h>

es-core/src/InputConfig.cpp

@@ -7,6 +7,7 @@
 #include "InputConfig.h"
 
 #include "Log.h"
+
 #include <pugixml.hpp>
 
 // Some utility functions.

es-core/src/InputConfig.h

@@ -9,13 +9,17 @@
 #define ES_CORE_INPUT_CONFIG_H
 
 #include <CECInput.h>
-#include <SDL_joystick.h>
-#include <SDL_keyboard.h>
 #include <map>
 #include <sstream>
 #include <vector>
 
-namespace pugi { class xml_node; }
+#ifdef __linux__
+#include <SDL2/SDL_joystick.h>
+#include <SDL2/SDL_keyboard.h>
+#else
+#include "SDL_joystick.h"
+#include "SDL_keyboard.h"
+#endif
 
 #define DEVICE_KEYBOARD -1
 #define DEVICE_CEC      -2
@@ -29,6 +33,11 @@ enum InputType {
     TYPE_COUNT
 };
 
+namespace pugi
+{
+    class xml_node;
+}
+
 struct Input
 {
 public:

es-core/src/InputManager.cpp

@@ -14,8 +14,14 @@
 #include "Platform.h"
 #include "Scripting.h"
 #include "Window.h"
+
+#ifdef __linux__
+#include <SDL2/SDL.h>
+#else
+#include "SDL.h"
+#endif
+
 #include <pugixml.hpp>
-#include <SDL.h>
 #include <assert.h>
 #include <iostream>
 

es-core/src/InputManager.h

@@ -10,7 +10,12 @@
 #ifndef ES_CORE_INPUT_MANAGER_H
 #define ES_CORE_INPUT_MANAGER_H
 
-#include <SDL_joystick.h>
+#ifdef __linux__
+#include <SDL2/SDL_joystick.h>
+#else
+#include "SDL_joystick.h"
+#endif
+
 #include <map>
 
 class InputConfig;

es-core/src/Platform.cpp

@@ -6,7 +6,12 @@
 
 #include "Platform.h"
 
-#include <SDL_events.h>
+#ifdef __linux__
+#include <SDL2/SDL_events.h>
+#else
+#include "SDL_events.h"
+#endif
+
 #ifdef WIN32
 #include <codecvt>
 #else

es-core/src/Sound.h

@@ -9,7 +9,12 @@
 #ifndef ES_CORE_SOUND_H
 #define ES_CORE_SOUND_H
 
+#ifdef __linux__
+#include <SDL2/SDL_audio.h>
+#else
 #include "SDL_audio.h"
+#endif
+
 #include <map>
 #include <memory>
 #include <vector>

es-core/src/components/VideoComponent.cpp

@@ -5,7 +5,12 @@
 #include "PowerSaver.h"
 #include "ThemeData.h"
 #include "Window.h"
-#include <SDL_timer.h>
+
+#ifdef __linux__
+#include <SDL2/SDL_timer.h>
+#else
+#include "SDL_timer.h"
+#endif
 
 #define FADE_TIME_MS	200
 

es-core/src/components/VideoVlcComponent.cpp

@@ -5,9 +5,16 @@
 #include "utils/StringUtil.h"
 #include "PowerSaver.h"
 #include "Settings.h"
+
+#ifdef __linux__
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_timer.h>
+#else
+#include "SDL_mutex.h"
+#include "SDL_timer.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <SDL_mutex.h>
-#include <SDL_timer.h>
 
 #ifdef WIN32
 #include <codecvt>
@@ -261,7 +268,7 @@ void VideoVlcComponent::startVideo()
 				// Asynchronous media parsing
 				libvlc_event_attach(libvlc_media_event_manager(mMedia), libvlc_MediaParsedChanged, VlcMediaParseCallback, 0);
 				parseResult = libvlc_media_parse_with_options(mMedia, libvlc_media_parse_local, -1);
-				
+
 				if (!parseResult)
 				{
 					// Wait for a maximum of 1 second for the media parsing

es-core/src/renderers/Renderer.cpp

@@ -13,7 +13,11 @@
 #include "Log.h"
 #include "Settings.h"
 
-#include <SDL.h>
+#ifdef __linux__
+#include <SDL2/SDL.h>
+#else
+#include "SDL.h"
+#endif
 #include <stack>
 
 namespace Renderer

es-core/src/renderers/Renderer_GL21.cpp

@@ -11,8 +11,13 @@
 #include "Log.h"
 #include "Settings.h"
 
-#include <SDL_opengl.h>
+#ifdef __linux__
-#include <SDL.h>
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_opengl.h>
+#else
+#include "SDL.h"
+#include "SDL_opengl.h"
+#endif
 
 namespace Renderer
 {

es-core/src/renderers/Renderer_GLES10.cpp

@@ -11,8 +11,13 @@
 #include "Log.h"
 #include "Settings.h"
 
-#include <SDL_opengles.h>
+#ifdef __linux__
-#include <SDL.h>
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_opengl.h>
+#else
+#include "SDL.h"
+#include "SDL_opengl.h"
+#endif
 
 namespace Renderer
 {