mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Include SDL2 using sub directory

Browse Source
This commit is contained in:
Ted John
2018-03-07 19:07:58 +00:00
committed by Michał Janiszewski
parent e318e0948a
commit 39a38dc193
22 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openrct2.common.props
View File

@@ -100,7 +100,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup> <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)\debug\lib;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)'!='Debug'">$(SolutionDir)lib\$(Platform)\lib;$(LibraryPath)</LibraryPath> <LibraryPath Condition="'$(Configuration)'!='Debug'">$(SolutionDir)lib\$(Platform)\lib;$(LibraryPath)</LibraryPath>
<LinkIncremental /> <LinkIncremental />

2
src/openrct2-ui/CursorRepository.h
View File

@@ -17,7 +17,7 @@
#include <map> #include <map>
#include <functional> #include <functional>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/interface/Cursors.h> #include <openrct2/interface/Cursors.h>

2
src/openrct2-ui/SDLException.h
View File

@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <SDL.h> #include <SDL2/SDL.h>
#include <stdexcept> #include <stdexcept>
/** /**

2
src/openrct2-ui/TextComposition.cpp
View File

@@ -15,7 +15,7 @@
#pragma endregion #pragma endregion
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/core/Math.hpp> #include <openrct2/core/Math.hpp>
#include <openrct2/core/Memory.hpp> #include <openrct2/core/Memory.hpp>
#include <openrct2/core/String.hpp> #include <openrct2/core/String.hpp>

4
src/openrct2-ui/UiContext.Win32.cpp
View File

@@ -33,8 +33,8 @@
#undef interface #undef interface
#include <windows.h> #include <windows.h>
#include <shlobj.h> #include <shlobj.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <SDL_syswm.h> #include <SDL2/SDL_syswm.h>
// Native resource IDs // Native resource IDs
#include "../../resources/resource.h" #include "../../resources/resource.h"

2
src/openrct2-ui/UiContext.cpp
View File

@@ -20,7 +20,7 @@
#include <cmath> #include <cmath>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/audio/AudioMixer.h> #include <openrct2/audio/AudioMixer.h>
#include <openrct2/config/Config.h> #include <openrct2/config/Config.h>
#include <openrct2/Context.h> #include <openrct2/Context.h>

2
src/openrct2-ui/audio/AudioChannel.cpp
View File

@@ -16,7 +16,7 @@
#include <openrct2/common.h> #include <openrct2/common.h>
#include <cmath> #include <cmath>
#include <SDL.h> #include <SDL2/SDL.h>
#include <speex/speex_resampler.h> #include <speex/speex_resampler.h>
#include <openrct2/core/Math.hpp> #include <openrct2/core/Math.hpp>
#include <openrct2/audio/AudioChannel.h> #include <openrct2/audio/AudioChannel.h>

2
src/openrct2-ui/audio/AudioContext.cpp
View File

@@ -15,7 +15,7 @@
#pragma endregion #pragma endregion
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/audio/AudioContext.h> #include <openrct2/audio/AudioContext.h>
#include <openrct2/core/String.hpp> #include <openrct2/core/String.hpp>
#include "../SDLException.h" #include "../SDLException.h"

2
src/openrct2-ui/audio/AudioFormat.h
View File

@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
namespace OpenRCT2 { namespace Audio namespace OpenRCT2 { namespace Audio
{ {

2
src/openrct2-ui/audio/AudioMixer.cpp
View File

@@ -18,7 +18,7 @@
#include <list> #include <list>
#include <vector> #include <vector>
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <speex/speex_resampler.h> #include <speex/speex_resampler.h>
#include <openrct2/Context.h> #include <openrct2/Context.h>
#include <openrct2/core/Guard.hpp> #include <openrct2/core/Guard.hpp>

2
src/openrct2-ui/audio/FileAudioSource.cpp
View File

@@ -15,7 +15,7 @@
#pragma endregion #pragma endregion
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/core/Math.hpp> #include <openrct2/core/Math.hpp>
#include <openrct2/audio/AudioSource.h> #include <openrct2/audio/AudioSource.h>
#include "AudioContext.h" #include "AudioContext.h"

2
src/openrct2-ui/audio/MemoryAudioSource.cpp
View File

@@ -17,7 +17,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/core/Math.hpp> #include <openrct2/core/Math.hpp>
#include <openrct2/audio/AudioMixer.h> #include <openrct2/audio/AudioMixer.h>
#include <openrct2/audio/AudioSource.h> #include <openrct2/audio/AudioSource.h>

2
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
View File

@@ -17,7 +17,7 @@
#include <cmath> #include <cmath>
#include <vector> #include <vector>
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/config/Config.h> #include <openrct2/config/Config.h>
#include <openrct2/drawing/IDrawingEngine.h> #include <openrct2/drawing/IDrawingEngine.h>
#include <openrct2/drawing/X8DrawingEngine.h> #include <openrct2/drawing/X8DrawingEngine.h>

2
src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
View File

@@ -16,7 +16,7 @@
#include <algorithm> #include <algorithm>
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/config/Config.h> #include <openrct2/config/Config.h>
#include <openrct2/core/Guard.hpp> #include <openrct2/core/Guard.hpp>
#include <openrct2/drawing/IDrawingEngine.h> #include <openrct2/drawing/IDrawingEngine.h>

2
src/openrct2-ui/drawing/engines/opengl/DrawRectShader.h
View File

@@ -19,7 +19,7 @@
#include "GLSLTypes.h" #include "GLSLTypes.h"
#include "OpenGLShaderProgram.h" #include "OpenGLShaderProgram.h"
#include "DrawCommands.h" #include "DrawCommands.h"
#include <SDL_pixels.h> #include <SDL2/SDL_pixels.h>
#include <vector> #include <vector>
class DrawRectShader final : public OpenGLShaderProgram class DrawRectShader final : public OpenGLShaderProgram

2
src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.cpp
View File

@@ -24,7 +24,7 @@
#include "OpenGLAPIProc.h" #include "OpenGLAPIProc.h"
#undef OPENGL_PROC #undef OPENGL_PROC
#include <SDL_video.h> #include <SDL2/SDL_video.h>
#include <openrct2/core/Console.hpp> #include <openrct2/core/Console.hpp>

2
src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
View File

@@ -48,7 +48,7 @@
#endif #endif
#include <SDL_opengl.h> #include <SDL2/SDL_opengl.h>
#if OPENGL_NO_LINK #if OPENGL_NO_LINK

2
src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@@ -19,7 +19,7 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <unordered_map> #include <unordered_map>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/config/Config.h> #include <openrct2/config/Config.h>
#include <openrct2/core/Console.hpp> #include <openrct2/core/Console.hpp>
#include <openrct2/drawing/Drawing.h> #include <openrct2/drawing/Drawing.h>

2
src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
View File

@@ -19,7 +19,7 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL_video.h> #include <SDL2/SDL_video.h>
#include "OpenGLFramebuffer.h" #include "OpenGLFramebuffer.h"
constexpr GLuint BACKBUFFER_ID = 0; constexpr GLuint BACKBUFFER_ID = 0;

2
src/openrct2-ui/drawing/engines/opengl/TextureCache.h
View File

@@ -20,7 +20,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <array> #include <array>
#include <SDL_pixels.h> #include <SDL2/SDL_pixels.h>
#include <openrct2/common.h> #include <openrct2/common.h>
#include "OpenGLAPI.h" #include "OpenGLAPI.h"
#include "GLSLTypes.h" #include "GLSLTypes.h"

2
src/openrct2-ui/input/Input.cpp
View File

@@ -14,7 +14,7 @@
*****************************************************************************/ *****************************************************************************/
#pragma endregion #pragma endregion
#include <SDL.h> #include <SDL2/SDL.h>
#include <cctype> #include <cctype>
#include <openrct2/Context.h> #include <openrct2/Context.h>
#include <openrct2/OpenRCT2.h> #include <openrct2/OpenRCT2.h>

2
src/openrct2-ui/input/KeyboardShortcuts.cpp
View File

@@ -15,7 +15,7 @@
#pragma endregion #pragma endregion
#include <openrct2/common.h> #include <openrct2/common.h>
#include <SDL.h> #include <SDL2/SDL.h>
#include <openrct2/core/Console.hpp> #include <openrct2/core/Console.hpp>
#include <openrct2/core/File.h> #include <openrct2/core/File.h>
#include <openrct2/core/FileStream.hpp> #include <openrct2/core/FileStream.hpp>