Merge pull request #8549 from janisozaur/sdl2-prefix

Drop SDL2/ prefix on includes
2019-01-07 22:32:26 +01:00 · 2019-01-07 22:32:26 +01:00 · 39b59b1185
parent eb4ddebe3e 85bc21ce25
commit 39b59b1185
23 changed files with 24 additions and 24 deletions
--- a/openrct2.common.props
+++ b/openrct2.common.props
@ -101,7 +101,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <PropertyGroup>
-    <IncludePath>$(SolutionDir)src;$(SolutionDir)lib\$(Platform)\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)src;$(SolutionDir)lib\$(Platform)\include;$(SolutionDir)lib\$(Platform)\include\SDL2;$(IncludePath)</IncludePath>
    <LibraryPath Condition="'$(Configuration)'=='Debug'">$(SolutionDir)lib\$(Platform)\debug\lib;$(LibraryPath)</LibraryPath>
    <LibraryPath Condition="'$(Configuration)'!='Debug'">$(SolutionDir)lib\$(Platform)\lib;$(LibraryPath)</LibraryPath>
    <LinkIncremental />
--- a/src/openrct2-ui/CursorRepository.h
+++ b/src/openrct2-ui/CursorRepository.h
@ -9,7 +9,7 @@

 #pragma once

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <functional>
 #include <map>
 #include <openrct2/interface/Cursors.h>
--- a/src/openrct2-ui/SDLException.h
+++ b/src/openrct2-ui/SDLException.h
@ -9,7 +9,7 @@

 #pragma once

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <stdexcept>
 #include <string>

--- a/src/openrct2-ui/TextComposition.cpp
+++ b/src/openrct2-ui/TextComposition.cpp
@ -12,7 +12,7 @@
 #include "UiContext.h"
 #include "interface/InGameConsole.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <openrct2-ui/interface/Window.h>
 #include <openrct2/common.h>
--- a/src/openrct2-ui/UiContext.Win32.cpp
+++ b/src/openrct2-ui/UiContext.Win32.cpp
@ -22,8 +22,8 @@
 // Then the rest
 #    include "UiContext.h"

-#    include <SDL2/SDL.h>
-#    include <SDL2/SDL_syswm.h>
+#    include <SDL.h>
+#    include <SDL_syswm.h>
 #    include <algorithm>
 #    include <openrct2/common.h>
 #    include <openrct2/core/Path.hpp>
--- a/src/openrct2-ui/UiContext.cpp
+++ b/src/openrct2-ui/UiContext.cpp
@ -19,7 +19,7 @@
 #include "interface/Theme.h"
 #include "title/TitleSequencePlayer.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <chrono>
 #include <cmath>
--- a/src/openrct2-ui/audio/AudioChannel.cpp
+++ b/src/openrct2-ui/audio/AudioChannel.cpp
@ -10,7 +10,7 @@
 #include "AudioContext.h"
 #include "AudioFormat.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <cmath>
 #include <openrct2/audio/AudioChannel.h>
--- a/src/openrct2-ui/audio/AudioContext.cpp
+++ b/src/openrct2-ui/audio/AudioContext.cpp
@ -11,7 +11,7 @@

 #include "../SDLException.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <openrct2/audio/AudioContext.h>
 #include <openrct2/common.h>
 #include <openrct2/core/String.hpp>
--- a/src/openrct2-ui/audio/AudioFormat.h
+++ b/src/openrct2-ui/audio/AudioFormat.h
@ -9,7 +9,7 @@

 #pragma once

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <openrct2/common.h>

 namespace OpenRCT2::Audio
--- a/src/openrct2-ui/audio/AudioMixer.cpp
+++ b/src/openrct2-ui/audio/AudioMixer.cpp
@ -10,7 +10,7 @@
 #include "AudioContext.h"
 #include "AudioFormat.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <iterator>
 #include <list>
--- a/src/openrct2-ui/audio/FileAudioSource.cpp
+++ b/src/openrct2-ui/audio/FileAudioSource.cpp
@ -10,7 +10,7 @@
 #include "AudioContext.h"
 #include "AudioFormat.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <openrct2/audio/AudioSource.h>
 #include <openrct2/common.h>
--- a/src/openrct2-ui/audio/MemoryAudioSource.cpp
+++ b/src/openrct2-ui/audio/MemoryAudioSource.cpp
@ -10,7 +10,7 @@
 #include "AudioContext.h"
 #include "AudioFormat.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <openrct2/audio/AudioMixer.h>
 #include <openrct2/audio/AudioSource.h>
--- a/src/openrct2-ui/drawing/BitmapReader.cpp
+++ b/src/openrct2-ui/drawing/BitmapReader.cpp
@ -9,7 +9,7 @@

 #include "BitmapReader.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <cstring>
 #include <openrct2/core/Imaging.h>
--- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
@ -9,7 +9,7 @@

 #include "DrawingEngineFactory.hpp"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <cmath>
 #include <openrct2/Game.h>
 #include <openrct2/common.h>
--- a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
@ -9,7 +9,7 @@

 #include "DrawingEngineFactory.hpp"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <openrct2/Game.h>
 #include <openrct2/common.h>
--- a/src/openrct2-ui/drawing/engines/opengl/DrawRectShader.h
+++ b/src/openrct2-ui/drawing/engines/opengl/DrawRectShader.h
@ -13,7 +13,7 @@
 #include "GLSLTypes.h"
 #include "OpenGLShaderProgram.h"

-#include <SDL2/SDL_pixels.h>
+#include <SDL_pixels.h>
 #include <vector>

 class DrawRectShader final : public OpenGLShaderProgram
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.cpp
@ -17,7 +17,7 @@
 #        include "OpenGLAPIProc.h"
 #        undef OPENGL_PROC

-#        include <SDL2/SDL_video.h>
+#        include <SDL_video.h>
 #        include <openrct2/core/Console.hpp>

 static const char* TryLoadAllProcAddresses()
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
@ -41,7 +41,7 @@

 #endif

-#include <SDL2/SDL_opengl.h>
+#include <SDL_opengl.h>
 // OpenRCT2: SDL_opengl.h includes windows.h, which defines the CreateWindow macro and causes conflicts
 #undef CreateWindow

--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
@ -21,7 +21,7 @@
 #    include "TextureCache.h"
 #    include "TransparencyDepth.h"

-#    include <SDL2/SDL.h>
+#    include <SDL.h>
 #    include <algorithm>
 #    include <cmath>
 #    include <openrct2-ui/interface/Window.h>
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
@ -11,7 +11,7 @@

 #    include "OpenGLFramebuffer.h"

-#    include <SDL2/SDL_video.h>
+#    include <SDL_video.h>
 #    include <algorithm>
 #    include <memory>
 #    include <openrct2/common.h>
--- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h
+++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h
@ -12,7 +12,7 @@
 #include "GLSLTypes.h"
 #include "OpenGLAPI.h"

-#include <SDL2/SDL_pixels.h>
+#include <SDL_pixels.h>
 #include <algorithm>
 #include <array>
 #include <openrct2/common.h>
--- a/src/openrct2-ui/input/Input.cpp
+++ b/src/openrct2-ui/input/Input.cpp
@ -13,7 +13,7 @@
 #include "../interface/InGameConsole.h"
 #include "KeyboardShortcuts.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <cctype>
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/Context.h>
--- a/src/openrct2-ui/input/KeyboardShortcuts.cpp
+++ b/src/openrct2-ui/input/KeyboardShortcuts.cpp
@ -9,7 +9,7 @@

 #include "KeyboardShortcuts.h"

-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <algorithm>
 #include <openrct2/PlatformEnvironment.h>
 #include <openrct2/common.h>