1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00

Drop SDL2/ prefix on includes

pkg-config, cmake, all demos and tests define the path with SDL2/
already included.
This commit is contained in:
Michał Janiszewski
2019-01-02 21:23:58 +01:00
committed by Aaron van Geffen
parent 0328355f9e
commit ecfbf60cc4
22 changed files with 23 additions and 23 deletions

View File

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

View File

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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

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

View File

@@ -10,7 +10,7 @@
#include "AudioContext.h"
#include "AudioFormat.h"
#include <SDL2/SDL.h>
#include <SDL.h>
#include <algorithm>
#include <iterator>
#include <list>

View File

@@ -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>

View File

@@ -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>

View File

@@ -9,7 +9,7 @@
#include "BitmapReader.h"
#include <SDL2/SDL.h>
#include <SDL.h>
#include <algorithm>
#include <cstring>
#include <openrct2/core/Imaging.h>

View File

@@ -9,7 +9,7 @@
#include "DrawingEngineFactory.hpp"
#include <SDL2/SDL.h>
#include <SDL.h>
#include <cmath>
#include <openrct2/Game.h>
#include <openrct2/common.h>

View File

@@ -9,7 +9,7 @@
#include "DrawingEngineFactory.hpp"
#include <SDL2/SDL.h>
#include <SDL.h>
#include <algorithm>
#include <openrct2/Game.h>
#include <openrct2/common.h>

View File

@@ -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

View File

@@ -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()

View File

@@ -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

View File

@@ -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>

View File

@@ -11,7 +11,7 @@
# include "OpenGLFramebuffer.h"
# include <SDL2/SDL_video.h>
# include <SDL_video.h>
# include <algorithm>
# include <memory>
# include <openrct2/common.h>

View File

@@ -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>

View File

@@ -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>

View File

@@ -9,7 +9,7 @@
#include "KeyboardShortcuts.h"
#include <SDL2/SDL.h>
#include <SDL.h>
#include <algorithm>
#include <openrct2/PlatformEnvironment.h>
#include <openrct2/common.h>