Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix glew cross compilation.

master
safety0ff 2011-02-20 19:36:28 -05:00 committed by Per Inge Mathisen
parent 1f8736e292
commit 2cb9d1e737
7 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/framework/opengl.h
View File

@ -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

2
lib/ivis_opengl/piedraw.cpp
View File

@ -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"

2
lib/ivis_opengl/piemode.cpp
View File

@ -26,8 +26,8 @@
*/
/***************************************************************************/
#include <GL/glew.h>
#include "lib/framework/frame.h"
#include "lib/framework/opengl.h" // for glew macros
#include <SDL.h>

1
lib/ivis_opengl/piestate.cpp
View File

@ -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>

2
lib/ivis_opengl/tex.cpp
View File

@ -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>

2
src/terrain.cpp
View File

@ -29,10 +29,10 @@
* 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"

7
src/texture.cpp
View File

@ -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"