Include SDL2 using sub directory

2018-03-07 19:07:58 +00:00 · 2018-03-07 19:07:58 +00:00 · 39a38dc193
parent e318e0948a
commit 39a38dc193
22 changed files with 23 additions and 23 deletions
--- a/openrct2.common.props
+++ b/openrct2.common.props
@ -100,7 +100,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <PropertyGroup>
-    <IncludePath>$(SolutionDir)src;$(SolutionDir)lib\$(Platform)\include;$(SolutionDir)lib\$(Platform)\include\sdl2;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)src;$(SolutionDir)lib\$(Platform)\include;$(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
@ -17,7 +17,7 @@
 #include <map>
 #include <functional>

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

 #include <openrct2/interface/Cursors.h>

--- a/src/openrct2-ui/SDLException.h
+++ b/src/openrct2-ui/SDLException.h
@ -16,7 +16,7 @@

 #pragma once

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

 /**
--- a/src/openrct2-ui/TextComposition.cpp
+++ b/src/openrct2-ui/TextComposition.cpp
@ -15,7 +15,7 @@
 #pragma endregion

 #include <openrct2/common.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/core/Memory.hpp>
 #include <openrct2/core/String.hpp>
--- a/src/openrct2-ui/UiContext.Win32.cpp
+++ b/src/openrct2-ui/UiContext.Win32.cpp
@ -33,8 +33,8 @@
 #undef interface
 #include <windows.h>
 #include <shlobj.h>
-#include <SDL.h>
-#include <SDL_syswm.h>
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_syswm.h>

 // Native resource IDs
 #include "../../resources/resource.h"
--- a/src/openrct2-ui/UiContext.cpp
+++ b/src/openrct2-ui/UiContext.cpp
@ -20,7 +20,7 @@
 #include <cmath>
 #include <memory>
 #include <vector>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/audio/AudioMixer.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/Context.h>
--- a/src/openrct2-ui/audio/AudioChannel.cpp
+++ b/src/openrct2-ui/audio/AudioChannel.cpp
@ -16,7 +16,7 @@

 #include <openrct2/common.h>
 #include <cmath>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <speex/speex_resampler.h>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/audio/AudioChannel.h>
--- a/src/openrct2-ui/audio/AudioContext.cpp
+++ b/src/openrct2-ui/audio/AudioContext.cpp
@ -15,7 +15,7 @@
 #pragma endregion

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

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

 namespace OpenRCT2 { namespace Audio
 {
--- a/src/openrct2-ui/audio/AudioMixer.cpp
+++ b/src/openrct2-ui/audio/AudioMixer.cpp
@ -18,7 +18,7 @@
 #include <list>
 #include <vector>
 #include <openrct2/common.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <speex/speex_resampler.h>
 #include <openrct2/Context.h>
 #include <openrct2/core/Guard.hpp>
--- a/src/openrct2-ui/audio/FileAudioSource.cpp
+++ b/src/openrct2-ui/audio/FileAudioSource.cpp
@ -15,7 +15,7 @@
 #pragma endregion

 #include <openrct2/common.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/audio/AudioSource.h>
 #include "AudioContext.h"
--- a/src/openrct2-ui/audio/MemoryAudioSource.cpp
+++ b/src/openrct2-ui/audio/MemoryAudioSource.cpp
@ -17,7 +17,7 @@
 #include <algorithm>
 #include <vector>
 #include <openrct2/common.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/audio/AudioMixer.h>
 #include <openrct2/audio/AudioSource.h>
--- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
@ -17,7 +17,7 @@
 #include <cmath>
 #include <vector>
 #include <openrct2/common.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/drawing/IDrawingEngine.h>
 #include <openrct2/drawing/X8DrawingEngine.h>
--- a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
@ -16,7 +16,7 @@

 #include <algorithm>
 #include <openrct2/common.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Guard.hpp>
 #include <openrct2/drawing/IDrawingEngine.h>
--- a/src/openrct2-ui/drawing/engines/opengl/DrawRectShader.h
+++ b/src/openrct2-ui/drawing/engines/opengl/DrawRectShader.h
@ -19,7 +19,7 @@
 #include "GLSLTypes.h"
 #include "OpenGLShaderProgram.h"
 #include "DrawCommands.h"
-#include <SDL_pixels.h>
+#include <SDL2/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
@ -24,7 +24,7 @@
 #include "OpenGLAPIProc.h"
 #undef OPENGL_PROC

-#include <SDL_video.h>
+#include <SDL2/SDL_video.h>

 #include <openrct2/core/Console.hpp>

--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
@ -48,7 +48,7 @@

 #endif

-#include <SDL_opengl.h>
+#include <SDL2/SDL_opengl.h>

 #if OPENGL_NO_LINK

--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
@ -19,7 +19,7 @@
 #include <algorithm>
 #include <cmath>
 #include <unordered_map>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Console.hpp>
 #include <openrct2/drawing/Drawing.h>
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
@ -19,7 +19,7 @@
 #include <algorithm>
 #include <memory>
 #include <openrct2/common.h>
-#include <SDL_video.h>
+#include <SDL2/SDL_video.h>
 #include "OpenGLFramebuffer.h"

 constexpr GLuint BACKBUFFER_ID = 0;
--- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h
+++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h
@ -20,7 +20,7 @@
 #include <unordered_map>
 #include <vector>
 #include <array>
-#include <SDL_pixels.h>
+#include <SDL2/SDL_pixels.h>
 #include <openrct2/common.h>
 #include "OpenGLAPI.h"
 #include "GLSLTypes.h"
--- a/src/openrct2-ui/input/Input.cpp
+++ b/src/openrct2-ui/input/Input.cpp
@ -14,7 +14,7 @@
 *****************************************************************************/
 #pragma endregion

-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <cctype>
 #include <openrct2/Context.h>
 #include <openrct2/OpenRCT2.h>
--- a/src/openrct2-ui/input/KeyboardShortcuts.cpp
+++ b/src/openrct2-ui/input/KeyboardShortcuts.cpp
@ -15,7 +15,7 @@
 #pragma endregion

 #include <openrct2/common.h>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <openrct2/core/Console.hpp>
 #include <openrct2/core/File.h>
 #include <openrct2/core/FileStream.hpp>