Fix glew cross compilation.

Warzone2100 · Apr 20, 2011 · 2cb9d1e · 2cb9d1e
1 parent 1f8736e
commit 2cb9d1e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/lib/framework/opengl.h b/lib/framework/opengl.h
@@ -24,6 +24,13 @@
 #ifndef __INCLUDED_LIB_FRAMEWORK_OPENGL_H__
 #define __INCLUDED_LIB_FRAMEWORK_OPENGL_H__
 
+/*
+ * glew.h includes inttypes.h under mingw and cygwin
+ * inttypes.h includes stdint.h
+ * We need to include wzglobal.h because we must
+ * define __STDC_LIMIT_MACROS before including stdint.h
+ */
+#include "lib/framework/wzglobal.h"
 #include <GL/glew.h>
 
 #endif
diff --git a/lib/ivis_opengl/piedraw.cpp b/lib/ivis_opengl/piedraw.cpp
@@ -21,10 +21,10 @@
  *  Render routines for 3D coloured and shaded transparency rendering.
  */
 
-#include <GL/glew.h>
 #include <string.h>
 
 #include "lib/framework/frame.h"
+#include "lib/framework/opengl.h"
 #include "lib/ivis_opengl/ivisdef.h"
 #include "lib/ivis_opengl/imd.h"
 #include "lib/ivis_opengl/piefunc.h"

diff --git a/lib/ivis_opengl/piemode.cpp b/lib/ivis_opengl/piemode.cpp
@@ -26,8 +26,8 @@
  */
 /***************************************************************************/
 
-#include <GL/glew.h>
 #include "lib/framework/frame.h"
+#include "lib/framework/opengl.h" // for glew macros
 
 #include <SDL.h>
 

diff --git a/lib/ivis_opengl/piestate.cpp b/lib/ivis_opengl/piestate.cpp
@@ -21,7 +21,6 @@
  *  Renderer setup and state control routines for 3D rendering.
  */
 
-#include <GL/glew.h>
 #include "lib/framework/frame.h"
 
 #include <SDL.h>

diff --git a/lib/ivis_opengl/tex.cpp b/lib/ivis_opengl/tex.cpp
@@ -18,8 +18,8 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include <GL/glew.h>
 #include "lib/framework/frame.h"
+#include "lib/framework/opengl.h"
 
 #if defined(WZ_OS_MAC)
 # include <OpenGL/glu.h>

diff --git a/src/terrain.cpp b/src/terrain.cpp
@@ -26,13 +26,13 @@
  * The technique used it called "texture splatting".
  * Every layer only draws the spots where that terrain is, and additive blending is used to make transitions smooth.
  * Decals are a kind of hack now, as for some tiles (where decal == true) the old tile is just drawn.
- * The water is drawn using the hardcoded page-80 and page-81 textures. 
+ * The water is drawn using the hardcoded page-80 and page-81 textures.
  */
 
-#include <GL/glew.h>
 #include <string.h>
 
 #include "lib/framework/frame.h"
+#include "lib/framework/opengl.h"
 #include "lib/ivis_opengl/ivisdef.h"
 #include "lib/ivis_opengl/imd.h"
 #include "lib/ivis_opengl/piefunc.h"

diff --git a/src/texture.cpp b/src/texture.cpp
@@ -23,17 +23,16 @@
  * This is where we do texture atlas generation.
  */
 
-#include <GL/glew.h>
-#include "lib/framework/frame.h"
-
-
 #include <string.h>
 
+#include "lib/framework/frame.h"
+
 #include <physfs.h>
 
 #include "lib/framework/file.h"
 #include "lib/framework/string_ext.h"
 
+#include "lib/framework/opengl.h"
 #include "lib/ivis_opengl/pietypes.h"
 #include "lib/ivis_opengl/piestate.h"
 #include "lib/ivis_opengl/tex.h"