diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-31 01:48:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-31 01:48:18 +0300 |
| commit | d53b058ec3f6208f34884ed572bb5d47de932108 (patch) | |
| tree | 980acf66aaa3b5df6b7e3e7e08dfccc0b9af8827 /src/gui | |
| parent | 4530a341c65ac12e50075fb3e3d6166cd2e1fe3b (diff) | |
| download | manaverse-d53b058ec3f6208f34884ed572bb5d47de932108.tar.gz manaverse-d53b058ec3f6208f34884ed572bb5d47de932108.tar.bz2 manaverse-d53b058ec3f6208f34884ed572bb5d47de932108.tar.xz manaverse-d53b058ec3f6208f34884ed572bb5d47de932108.zip | |
Fix different include issues.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/sdlinput.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_video.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windowmanager.cpp | 8 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 3dfa5d6d6..9f4ce0c93 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -90,7 +90,6 @@ #include "gui/gui.h" #endif -#include <SDL_keyboard.h> #include <SDL_timer.h> #include "debug.h" diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 591093bc8..3c38466a7 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/tabs/setup_video.h" -#include "configuration.h" - #include "gui/windowmanager.h" #include "gui/windows/okdialog.h" @@ -51,8 +49,6 @@ #include "gui/models/modelistmodel.h" #include "gui/models/opengllistmodel.h" -#include "render/renderers.h" - #include <sstream> #include "debug.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 479c8d2ca..9176c448a 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -35,7 +35,9 @@ #include "gui/popups/textpopup.h" -#ifndef DYECMD +#ifdef DYECMD +#include "render/graphics.h" +#else // DYECMD #include "gui/popups/beingpopup.h" #include "gui/popups/itempopup.h" #include "gui/popups/popupmenu.h" @@ -46,7 +48,7 @@ #include "gui/windows/didyouknowwindow.h" #include "gui/windows/helpwindow.h" #include "gui/windows/setupwindow.h" -#endif +#endif // DYECMD #include "gui/widgets/createwidget.h" #include "gui/widgets/desktop.h" @@ -61,8 +63,6 @@ #include "utils/naclmessages.h" #endif // __native_client__ -#include "render/graphics.h" - #ifdef ANDROID #ifndef USE_SDL2 #include <SDL_screenkeyboard.h> |