diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-07-15 19:39:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-07-15 19:39:12 +0300 |
| commit | 1fe641c6a8e5a9186645e7b776a31337064f77d8 (patch) | |
| tree | e2df69cee9be4214b4dfc38e5c40b6f56e2eb48b | |
| parent | 5865c48f81cc988a3aebe353897d68c43f05378b (diff) | |
| download | manaplus-1fe641c6a8e5a9186645e7b776a31337064f77d8.tar.gz manaplus-1fe641c6a8e5a9186645e7b776a31337064f77d8.tar.bz2 manaplus-1fe641c6a8e5a9186645e7b776a31337064f77d8.tar.xz manaplus-1fe641c6a8e5a9186645e7b776a31337064f77d8.zip | |
Fix different include issues.
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 2 | ||||
| -rw-r--r-- | src/itemcolormanager.cpp | 2 | ||||
| -rw-r--r-- | src/itemcolormanager.h | 4 | ||||
| -rw-r--r-- | src/net/eathena/itemrecv.cpp | 2 | ||||
| -rw-r--r-- | src/render/mobileopengl2graphics.h | 10 | ||||
| -rw-r--r-- | src/render/sdlgraphics.h | 4 |
6 files changed, 13 insertions, 11 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index fe45e9ea0..d03f1d623 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -45,6 +45,8 @@ #include "resources/image/image.h" +#include "resources/item/cardslist.h" + #include "resources/loaders/imageloader.h" #include "resources/loaders/imagesetloader.h" diff --git a/src/itemcolormanager.cpp b/src/itemcolormanager.cpp index e1518e0b5..450aa8ffe 100644 --- a/src/itemcolormanager.cpp +++ b/src/itemcolormanager.cpp @@ -24,6 +24,8 @@ #include "resources/db/itemdb.h" +#include "resources/item/cardslist.h" + #include "debug.h" ItemColor ItemColorManager::getColorFromCards(const int *const cards) diff --git a/src/itemcolormanager.h b/src/itemcolormanager.h index 61addf721..84e1221de 100644 --- a/src/itemcolormanager.h +++ b/src/itemcolormanager.h @@ -23,10 +23,10 @@ #include "enums/simpletypes/itemcolor.h" -#include "resources/item/cardslist.h" - #include "localconsts.h" +struct CardsList; + class ItemColorManager final { public: diff --git a/src/net/eathena/itemrecv.cpp b/src/net/eathena/itemrecv.cpp index 77fe5cd0c..eea55f340 100644 --- a/src/net/eathena/itemrecv.cpp +++ b/src/net/eathena/itemrecv.cpp @@ -28,6 +28,8 @@ #include "net/messagein.h" +#include "resources/item/cardslist.h" + #include "debug.h" namespace EAthena diff --git a/src/render/mobileopengl2graphics.h b/src/render/mobileopengl2graphics.h index d63e6a2e1..b351440fd 100644 --- a/src/render/mobileopengl2graphics.h +++ b/src/render/mobileopengl2graphics.h @@ -23,7 +23,7 @@ #ifndef RENDER_MOBILEOPENGL2GRAPHICS_H #define RENDER_MOBILEOPENGL2GRAPHICS_H -#if defined USE_OPENGL && !defined ANDROID +#if defined(USE_OPENGL) && !defined(ANDROID) #include "localconsts.h" @@ -35,17 +35,17 @@ #include <GLES/gl.h> #include <GLES/glext.h> #include <GLES2/gl2.h> -#else +#else // ANDROID #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 -#endif +#endif // USE_SDL2 #include <SDL_opengl.h> #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) #include <GL/glext.h> #endif // defined(__APPLE__) -#endif +#endif // ANDROID class OpenGLGraphicsVertexes; class ShaderProgram; @@ -154,6 +154,6 @@ class MobileOpenGL2Graphics final : public Graphics #endif FBOInfo mFbo; }; -#endif +#endif // defined(USE_OPENGL) && !defined(ANDROID) #endif // RENDER_MOBILEOPENGL2GRAPHICS_H diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h index 0f18c3c03..bb9e7bd60 100644 --- a/src/render/sdlgraphics.h +++ b/src/render/sdlgraphics.h @@ -33,10 +33,6 @@ RENDER_SDL2GRAPHICS_H #include "localconsts.h" -class Image; -class ImageCollection; -class ImageVertexes; - /** * A central point of control for graphics. */ |