Fix glew cross compilation.
parent
1f8736e292
commit
2cb9d1e737
|
@ -24,6 +24,13 @@
|
||||||
#ifndef __INCLUDED_LIB_FRAMEWORK_OPENGL_H__
|
#ifndef __INCLUDED_LIB_FRAMEWORK_OPENGL_H__
|
||||||
#define __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>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -21,10 +21,10 @@
|
||||||
* Render routines for 3D coloured and shaded transparency rendering.
|
* Render routines for 3D coloured and shaded transparency rendering.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "lib/framework/frame.h"
|
#include "lib/framework/frame.h"
|
||||||
|
#include "lib/framework/opengl.h"
|
||||||
#include "lib/ivis_opengl/ivisdef.h"
|
#include "lib/ivis_opengl/ivisdef.h"
|
||||||
#include "lib/ivis_opengl/imd.h"
|
#include "lib/ivis_opengl/imd.h"
|
||||||
#include "lib/ivis_opengl/piefunc.h"
|
#include "lib/ivis_opengl/piefunc.h"
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
*/
|
*/
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include "lib/framework/frame.h"
|
#include "lib/framework/frame.h"
|
||||||
|
#include "lib/framework/opengl.h" // for glew macros
|
||||||
|
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
* Renderer setup and state control routines for 3D rendering.
|
* Renderer setup and state control routines for 3D rendering.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include "lib/framework/frame.h"
|
#include "lib/framework/frame.h"
|
||||||
|
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include "lib/framework/frame.h"
|
#include "lib/framework/frame.h"
|
||||||
|
#include "lib/framework/opengl.h"
|
||||||
|
|
||||||
#if defined(WZ_OS_MAC)
|
#if defined(WZ_OS_MAC)
|
||||||
# include <OpenGL/glu.h>
|
# include <OpenGL/glu.h>
|
||||||
|
|
|
@ -29,10 +29,10 @@
|
||||||
* 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 <string.h>
|
||||||
|
|
||||||
#include "lib/framework/frame.h"
|
#include "lib/framework/frame.h"
|
||||||
|
#include "lib/framework/opengl.h"
|
||||||
#include "lib/ivis_opengl/ivisdef.h"
|
#include "lib/ivis_opengl/ivisdef.h"
|
||||||
#include "lib/ivis_opengl/imd.h"
|
#include "lib/ivis_opengl/imd.h"
|
||||||
#include "lib/ivis_opengl/piefunc.h"
|
#include "lib/ivis_opengl/piefunc.h"
|
||||||
|
|
|
@ -23,17 +23,16 @@
|
||||||
* This is where we do texture atlas generation.
|
* This is where we do texture atlas generation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include "lib/framework/frame.h"
|
|
||||||
|
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "lib/framework/frame.h"
|
||||||
|
|
||||||
#include <physfs.h>
|
#include <physfs.h>
|
||||||
|
|
||||||
#include "lib/framework/file.h"
|
#include "lib/framework/file.h"
|
||||||
#include "lib/framework/string_ext.h"
|
#include "lib/framework/string_ext.h"
|
||||||
|
|
||||||
|
#include "lib/framework/opengl.h"
|
||||||
#include "lib/ivis_opengl/pietypes.h"
|
#include "lib/ivis_opengl/pietypes.h"
|
||||||
#include "lib/ivis_opengl/piestate.h"
|
#include "lib/ivis_opengl/piestate.h"
|
||||||
#include "lib/ivis_opengl/tex.h"
|
#include "lib/ivis_opengl/tex.h"
|
||||||
|
|
Loading…
Reference in New Issue