[colobot] 368/390: Fixed glew linking problem on MXE

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit 619ac3cf8d087079b32d7a64be29441f5c59d0bc
Author: Piotr Dziwinski <piotrdz at gmail.com>
Date:   Tue May 19 23:02:54 2015 +0200

    Fixed glew linking problem on MXE
---
 src/graphics/opengl/gl33device.cpp | 6 +-----
 src/graphics/opengl/gl33device.h   | 1 -
 src/graphics/opengl/gldevice.cpp   | 3 ---
 src/graphics/opengl/gldevice.h     | 2 --
 src/graphics/opengl/glutil.cpp     | 3 ---
 src/graphics/opengl/glutil.h       | 7 ++++++-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/graphics/opengl/gl33device.cpp b/src/graphics/opengl/gl33device.cpp
index 6092a32..193440c 100644
--- a/src/graphics/opengl/gl33device.cpp
+++ b/src/graphics/opengl/gl33device.cpp
@@ -18,9 +18,7 @@
  */
 
 #include "graphics/opengl/gl33device.h"
-#include "graphics/opengl/glutil.h"
 #include "graphics/engine/engine.h"
-#include "physfs.h"
 
 #include "common/config.h"
 #include "common/image.h"
@@ -29,10 +27,8 @@
 #include "math/geometry.h"
 
 
-// Using GLEW so only glew.h is needed
-#include <GL/glew.h>
-
 #include <SDL.h>
+#include <physfs.h>
 
 #include <cassert>
 
diff --git a/src/graphics/opengl/gl33device.h b/src/graphics/opengl/gl33device.h
index 698f81b..9c14e38 100644
--- a/src/graphics/opengl/gl33device.h
+++ b/src/graphics/opengl/gl33device.h
@@ -26,7 +26,6 @@
 
 #include "graphics/core/device.h"
 #include "graphics/opengl/glutil.h"
-#include "GL/glew.h"
 
 #include <string>
 #include <vector>
diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp
index 84a5472..2537756 100644
--- a/src/graphics/opengl/gldevice.cpp
+++ b/src/graphics/opengl/gldevice.cpp
@@ -28,9 +28,6 @@
 #include "math/geometry.h"
 
 
-// Using GLEW so only glew.h is needed
-#include <GL/glew.h>
-
 #include <SDL.h>
 
 #include <cassert>
diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h
index dd9e8d0..b754edc 100644
--- a/src/graphics/opengl/gldevice.h
+++ b/src/graphics/opengl/gldevice.h
@@ -24,10 +24,8 @@
 
 #pragma once
 
-
 #include "graphics/core/device.h"
 #include "graphics/opengl/glutil.h"
-#include "GL/glew.h"
 
 #include <string>
 #include <vector>
diff --git a/src/graphics/opengl/glutil.cpp b/src/graphics/opengl/glutil.cpp
index d39ac5a..fd03b33 100644
--- a/src/graphics/opengl/glutil.cpp
+++ b/src/graphics/opengl/glutil.cpp
@@ -18,9 +18,6 @@
  */
 
 #include "graphics/opengl/glutil.h"
-#include "graphics/core/device.h"
-
-#include "GL/glew.h"
 
 // Graphics module namespace
 namespace Gfx {
diff --git a/src/graphics/opengl/glutil.h b/src/graphics/opengl/glutil.h
index 7f9e701..b0f0606 100644
--- a/src/graphics/opengl/glutil.h
+++ b/src/graphics/opengl/glutil.h
@@ -20,7 +20,12 @@
 #pragma once
 
 #include "graphics/core/device.h"
-#include "GL/glew.h"
+
+// config.h must be included before glew.h
+#include "common/config.h"
+
+#include <GL/glew.h>
+
 
 // Graphics module namespace
 namespace Gfx

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git