diff options
| -rw-r--r-- | src/graphics.cpp | 1 | ||||
| -rw-r--r-- | src/graphicsvertexes.h | 5 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/button.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/popup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/progressbar.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/scrollarea.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tab.cpp | 2 | ||||
| -rw-r--r-- | src/keyboarddata.h | 1 | ||||
| -rw-r--r-- | src/maplayer.cpp | 1 |
10 files changed, 5 insertions, 13 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp index 0e2b807ec..36cbde8d0 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -29,7 +29,6 @@ #include "graphicsvertexes.h" #include "logger.h" -#include "resources/image.h" #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h index 8868a3d83..31eb401f2 100644 --- a/src/graphicsvertexes.h +++ b/src/graphicsvertexes.h @@ -30,12 +30,15 @@ //#define NO_SDL_GLEXT #define GL_GLEXT_PROTOTYPES 1 -#include <SDL_opengl.h> +#include <SDL/SDL.h> +#include <SDL/SDL_opengl.h> #include "safeopenglgraphics.h" #include "normalopenglgraphics.h" #endif +#include "resources/image.h" + #include <string> #include <list> #include <vector> diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 382e0f355..358974707 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -31,7 +31,6 @@ #include "inputmanager.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "maplayer.h" #include "playerinfo.h" #include "textmanager.h" diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 51d4efc6c..d464940ec 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -33,7 +33,6 @@ #include "gui/palette.h" #include "gui/theme.h" -#include "resources/image.h" #include "resources/imageset.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 228dcc040..e02c973dd 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -32,8 +32,6 @@ #include "gui/widgets/window.h" -#include "resources/image.h" - #include <guichan/exception.hpp> #include "debug.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 10590d72d..6dd24ce56 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -31,8 +31,6 @@ #include "gui/gui.h" #include "gui/sdlfont.h" -#include "resources/image.h" - #include "utils/dtor.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 2906ab641..2af6ad3be 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -30,8 +30,6 @@ #include "gui/theme.h" -#include "resources/image.h" - #include "utils/dtor.h" #include "debug.h" diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 81b43445c..a9f3763b5 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -33,8 +33,6 @@ #include "gui/widgets/tabbedarea.h" -#include "resources/image.h" - #include "utils/dtor.h" #include <guichan/widgets/label.hpp> diff --git a/src/keyboarddata.h b/src/keyboarddata.h index 5fa2f0e1d..d2398454f 100644 --- a/src/keyboarddata.h +++ b/src/keyboarddata.h @@ -24,6 +24,7 @@ #define KEYBOARDDATA_H #include "actionmanager.h" +#include "inputmanager.h" #include "localconsts.h" #include "utils/gettext.h" diff --git a/src/maplayer.cpp b/src/maplayer.cpp index 0db298258..f94542cc6 100644 --- a/src/maplayer.cpp +++ b/src/maplayer.cpp @@ -28,7 +28,6 @@ #include "localplayer.h" -#include "resources/image.h" #include "resources/resourcemanager.h" #include "gui/gui.h" |