Removed unnecessary #ifdefs for the SDL2 include files.

es-app/src/guis/GuiInfoPopup.cpp

@@ -10,11 +10,7 @@
 #include "components/NinePatchComponent.h"
 #include "components/TextComponent.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL_timer.h>
-#else
-#include "SDL_timer.h"
-#endif
 
 GuiInfoPopup::GuiInfoPopup(
         Window* window,

es-app/src/guis/GuiMenu.cpp

@@ -29,12 +29,7 @@
 #include "VolumeControl.h"
 
 #include <algorithm>
-
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL_events.h>
-#else
-#include "SDL_events.h"
-#endif
 
 GuiMenu::GuiMenu(Window* window) : GuiComponent(window),
         mMenu(window, "MAIN MENU"), mVersion(window)

es-app/src/main.cpp

@@ -33,19 +33,13 @@
 #include "SystemData.h"
 #include "SystemScreenSaver.h"
 
-#if defined(_WIN64)
-#include <cstring>
-#include <windows.h>
-#endif
-
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL_events.h>
 #include <SDL2/SDL_main.h>
 #include <SDL2/SDL_timer.h>
-#else
+
-#include "SDL_events.h"
+#if defined(_WIN64)
-#include "SDL_main.h"
+#include <cstring>
-#include "SDL_timer.h"
+#include <windows.h>
 #endif
 
 #include <FreeImage.h>

es-core/src/AudioManager.cpp

@@ -10,11 +10,7 @@
 #include "Settings.h"
 #include "Sound.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL.h>
-#else
-#include "SDL.h"
-#endif
 
 std::vector<std::shared_ptr<Sound>> AudioManager::sSoundVector;
 SDL_AudioSpec AudioManager::sAudioFormat;

es-core/src/AudioManager.h

@@ -8,11 +8,7 @@
 #ifndef ES_CORE_AUDIO_MANAGER_H
 #define ES_CORE_AUDIO_MANAGER_H
 
-#if defined(__linux__) || defined (_WIN64)
 #include <SDL2/SDL_audio.h>
-#else
-#include "SDL_audio.h"
-#endif
 
 #include <memory>
 #include <vector>

es-core/src/CECInput.cpp

@@ -13,13 +13,9 @@
 #include <libcec/cec.h>
 #include <libcec/cecloader.h>
 
-#ifdef __linux__
 #include <SDL2/SDL_events.h>
-#else
-#include "SDL_events.h"
-#endif // __linux__
 
-#ifdef _RPI_
+#if defined(_RPI_)
 extern "C" {
 #include <interface/vmcs_host/vc_cecservice.h>
 #include <interface/vmcs_host/vc_tvservice.h>

es-core/src/InputConfig.h

@@ -8,19 +8,13 @@
 #ifndef ES_CORE_INPUT_CONFIG_H
 #define ES_CORE_INPUT_CONFIG_H
 
+#include <SDL2/SDL_joystick.h>
+#include <SDL2/SDL_keyboard.h>
 #include <CECInput.h>
 #include <map>
 #include <sstream>
 #include <vector>
 
-#if defined(__linux__) || defined(_WIN64)
-#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
 

es-core/src/InputManager.cpp

@@ -16,12 +16,7 @@
 #include "Scripting.h"
 #include "Window.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL.h>
-#else
-#include "SDL.h"
-#endif
-
 #include <pugixml.hpp>
 #include <assert.h>
 #include <iostream>

es-core/src/Platform.cpp

@@ -13,11 +13,7 @@
 #include "MameNames.h"
 #include "Settings.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL_events.h>
-#else
-#include "SDL_events.h"
-#endif
 
 #if defined(__APPLE__)
 #include <array>

es-core/src/Sound.h

@@ -9,16 +9,11 @@
 #ifndef ES_CORE_SOUND_H
 #define ES_CORE_SOUND_H
 
-#if defined(__linux__) || defined(_WIN64)
-#include <SDL2/SDL_audio.h>
-#else
-#include "SDL_audio.h"
-#endif
-
 #if defined(__APPLE__)
 #include <sstream>
 #endif
 
+#include <SDL2/SDL_audio.h>
 #include <map>
 #include <memory>
 #include <vector>

es-core/src/components/VideoComponent.cpp

@@ -12,11 +12,7 @@
 #include "ThemeData.h"
 #include "Window.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL_timer.h>
-#else
-#include "SDL_timer.h"
-#endif
 
 #define FADE_TIME_MS	200
 

es-core/src/components/VideoVlcComponent.cpp

@@ -16,14 +16,8 @@
 #include "utils/FileSystemUtil.h"
 #endif
 
-#if defined(__linux__) || defined(_WIN64) || defined(__APPLE__)
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_timer.h>
-#else
-#include "SDL_mutex.h"
-#include "SDL_timer.h"
-#endif
-
 #include <vlc/vlc.h>
 
 #if defined(_WIN64)

es-core/src/renderers/Renderer.cpp

@@ -13,11 +13,7 @@
 #include "Log.h"
 #include "Settings.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL.h>
-#else
-#include "SDL.h"
-#endif
 #include <stack>
 
 namespace Renderer

es-core/src/renderers/Renderer_GL21.cpp

@@ -11,13 +11,8 @@
 #include "Log.h"
 #include "Settings.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #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,13 +11,8 @@
 #include "Log.h"
 #include "Settings.h"
 
-#if defined(__linux__) || defined(_WIN64)
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_opengles.h>
-#else
-#include "SDL.h"
-#include "SDL_opengles.h"
-#endif
 
 namespace Renderer
 {