mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix includes for moved files

This commit is contained in:
Ted John 2017-03-24 01:36:05 +00:00 committed by Gymnasiast
parent 19aafc4e24
commit c7b66ab193
14 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-dll/openrct2-dll.vcxproj
View File

@ -45,7 +45,7 @@
<AdditionalOptions>$(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalDependencies>libopenrct2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libopenrct2.lib;libopenrct2ui.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ProgramDatabaseFile>$(OutDir)openrct2-dll.pdb</ProgramDatabaseFile>
</Link>
<Lib>

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

@ -14,25 +14,26 @@
*****************************************************************************/
#pragma endregion
#include "../../core/Guard.hpp"
#include "../../core/Math.hpp"
#include "../../core/Memory.hpp"
#include "../IDrawingContext.h"
#include "../IDrawingEngine.h"
#include "../Rain.h"
#include <openrct2/config/Config.h>
#include <openrct2/core/Guard.hpp>
#include <openrct2/core/Math.hpp>
#include <openrct2/core/Memory.hpp>
#include <openrct2/drawing/IDrawingContext.h>
#include <openrct2/drawing/IDrawingEngine.h>
#include <openrct2/drawing/Rain.h>
extern "C"
{
#include "../../config/Config.h"
#include "../../game.h"
#include "../../interface/screenshot.h"
#include "../../interface/viewport.h"
#include "../../interface/window.h"
#include "../../intro.h"
#include "../../platform/platform.h"
#include "../../rct2.h"
#include "../drawing.h"
#include "../lightfx.h"
#include <openrct2/config/Config.h>
#include <openrct2/game.h>
#include <openrct2/interface/screenshot.h>
#include <openrct2/interface/viewport.h>
#include <openrct2/interface/window.h>
#include <openrct2/intro.h>
#include <openrct2/platform/platform.h>
#include <openrct2/rct2.h>
#include <openrct2/drawing/drawing.h>
#include <openrct2/drawing/lightfx.h>
}
class SoftwareDrawingEngine;

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

@ -16,7 +16,7 @@
#pragma once
#include "../../../common.h"
#include <openrct2/common.h>
#include "OpenGLAPI.h"
#include "GLSLTypes.h"
#include "TextureCache.h"

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

@ -16,7 +16,7 @@
#pragma once
#include "../../../common.h"
#include <openrct2/common.h>
#pragma pack(push, 1)

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

@ -23,7 +23,7 @@
#include <SDL_video.h>
#include "../../../core/Console.hpp"
#include <openrct2/core/Console.hpp>
template <typename T>
static inline bool SetProc(T * func, const char * name)

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

@ -16,7 +16,7 @@
#pragma once
#include "../../../common.h"
#include <openrct2/common.h>
#if OPENGL_NO_LINK

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

@ -40,22 +40,22 @@ IDrawingEngine * DrawingEngineFactory::CreateOpenGL()
#include "TextureCache.h"
#include "DrawCommands.h"
#include "../../../core/Console.hpp"
#include "../../../core/Exception.hpp"
#include "../../../core/Math.hpp"
#include "../../../core/Memory.hpp"
#include "../../IDrawingContext.h"
#include "../../IDrawingEngine.h"
#include "../../Rain.h"
#include "../../../config/Config.h"
#include <openrct2/core/Console.hpp>
#include <openrct2/core/Exception.hpp>
#include <openrct2/core/Math.hpp>
#include <openrct2/core/Memory.hpp>
#include <openrct2/drawing/IDrawingContext.h>
#include <openrct2/drawing/IDrawingEngine.h>
#include <openrct2/drawing/Rain.h>
#include <openrct2/config/Config.h>
extern "C"
{
#include "../../../config/Config.h"
#include "../../../interface/screenshot.h"
#include "../../../interface/window.h"
#include "../../../intro.h"
#include "../../drawing.h"
#include <openrct2/config/Config.h>
#include <openrct2/interface/screenshot.h>
#include <openrct2/interface/window.h>
#include <openrct2/intro.h>
#include <openrct2/drawing/drawing.h>
}
struct OpenGLVersion

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

@ -16,9 +16,9 @@
#ifndef DISABLE_OPENGL
#include "../../../common.h"
#include <openrct2/common.h>
#include <SDL_video.h>
#include "../../../core/Memory.hpp"
#include <openrct2/core/Memory.hpp>
#include "OpenGLFramebuffer.h"
constexpr GLuint BACKBUFFER_ID = 0;

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

@ -16,7 +16,7 @@
#pragma once
#include "../../../common.h"
#include <openrct2/common.h>
#include "OpenGLAPI.h"
struct SDL_Window;

14
src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.cpp
View File

@ -16,17 +16,17 @@
#ifndef DISABLE_OPENGL
#include "../../../core/Console.hpp"
#include "../../../core/Exception.hpp"
#include "../../../core/FileStream.hpp"
#include "../../../core/Memory.hpp"
#include "../../../core/Path.hpp"
#include "../../../core/String.hpp"
#include <openrct2/core/Console.hpp>
#include <openrct2/core/Exception.hpp>
#include <openrct2/core/FileStream.hpp>
#include <openrct2/core/Memory.hpp>
#include <openrct2/core/Path.hpp>
#include <openrct2/core/String.hpp>
#include "OpenGLShaderProgram.h"
extern "C"
{
#include "../../../platform/platform.h"
#include <openrct2/platform/platform.h>
}
OpenGLShader::OpenGLShader(const char * name, GLenum type)

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

@ -16,7 +16,7 @@
#pragma once
#include "../../../common.h"
#include <openrct2/common.h>
#include "OpenGLAPI.h"
class OpenGLShader final

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

@ -16,7 +16,7 @@
#pragma once
#include "../../../common.h"
#include <openrct2/common.h>
#include "OpenGLAPI.h"
class CopyFramebufferShader;

4
src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
View File

@ -18,12 +18,12 @@
#include <vector>
#include <stdexcept>
#include "../../../core/Memory.hpp"
#include <openrct2/core/Memory.hpp>
#include "TextureCache.h"
extern "C"
{
#include "../../drawing.h"
#include <openrct2/drawing/drawing.h>
}
TextureCache::~TextureCache()

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

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