summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-15 22:03:17 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-16 13:50:43 +0300
commit23034a47937c109590eb60e4ee0efa32a8c9e45e (patch)
tree844c716da20752dcbb0aead649011f54d8062635 /src/render
parent4638f969d4206ba8dd857eb6d2758106cc5268df (diff)
downloadmanaverse-23034a47937c109590eb60e4ee0efa32a8c9e45e.tar.gz
manaverse-23034a47937c109590eb60e4ee0efa32a8c9e45e.tar.bz2
manaverse-23034a47937c109590eb60e4ee0efa32a8c9e45e.tar.xz
manaverse-23034a47937c109590eb60e4ee0efa32a8c9e45e.zip
Remove useless includes from cpp files
Diffstat (limited to 'src/render')
-rw-r--r--src/render/graphics.cpp10
-rw-r--r--src/render/mobileopenglgraphics.cpp2
-rw-r--r--src/render/modernopenglgraphics.cpp2
-rw-r--r--src/render/normalopenglgraphics.cpp1
-rw-r--r--src/render/nullopenglgraphics.cpp1
-rw-r--r--src/render/safeopenglgraphics.cpp2
-rw-r--r--src/render/surfacegraphics.cpp2
7 files changed, 7 insertions, 13 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 921e8334f..17f8a6d2e 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -65,16 +65,20 @@
#include "render/graphics.h"
-#include "main.h"
-
+#ifdef USE_OPENGL
#include "configuration.h"
#include "graphicsmanager.h"
+#endif
#include "logger.h"
+#if defined(USE_OPENGL) && defined(USE_X11)
#include "render/mglxinit.h"
+#endif
#include "resources/imagehelper.h"
+#ifdef USE_OPENGL
#include "resources/openglimagehelper.h"
+#endif
#ifdef USE_OPENGL
#ifdef __APPLE__
@@ -261,7 +265,7 @@ bool Graphics::setOpenGLMode()
return false;
}
-#if defined(USE_OPENGL) && defined(USE_X11)
+#if defined(USE_X11)
Glx::initFunctions();
#endif
#ifdef USE_SDL2
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index a0543a2ea..2c337c294 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -20,8 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "main.h"
-
#ifdef USE_OPENGL
#include "render/mobileopenglgraphics.h"
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index e4e9b7f5b..87145d673 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -20,8 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "main.h"
-
#if defined USE_OPENGL && !defined ANDROID
#include "render/modernopenglgraphics.h"
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 4ba78bb58..dd4fe3002 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -20,7 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "main.h"
#if defined USE_OPENGL && !defined ANDROID
#include "render/normalopenglgraphics.h"
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index cb952eab4..dba15449a 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -20,7 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "main.h"
#if defined USE_OPENGL
#include "render/nullopenglgraphics.h"
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index 415f7f9b4..191a95531 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -20,8 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "main.h"
-
#if defined USE_OPENGL && !defined ANDROID
#include "render/safeopenglgraphics.h"
diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp
index ba2d69f1b..c74351b92 100644
--- a/src/render/surfacegraphics.cpp
+++ b/src/render/surfacegraphics.cpp
@@ -22,8 +22,6 @@
#include "render/surfacegraphics.h"
-#include "main.h"
-
#include "resources/image.h"
#include "resources/surfaceimagehelper.h"