Demos (cmake): demos: Fix MinGW32 build.

[Jose Fonseca]

Module: Demos
Branch: cmake
Commit: 297f5d25259839580e7a5eeef5f24758fdf561a9
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=297f5d25259839580e7a5eeef5f24758fdf561a9

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Nov  5 17:14:34 2010 +0000

demos: Fix MinGW32 build.

---

 src/demos/ipers.c    |    1 +
 src/demos/renormal.c |    1 +
 src/demos/tessdemo.c |   41 ++++++++++++++++-------------------------
 src/demos/texenv.c   |    1 +
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/demos/ipers.c b/src/demos/ipers.c
index 4b57d78..d2f3a11 100644
--- a/src/demos/ipers.c
+++ b/src/demos/ipers.c
@@ -16,6 +16,7 @@
 #include <mmsystem.h>
 #endif
 
+#include <GL/glew.h> /* for GL_RESCALE_NORMAL_EXT */
 #include <GL/glut.h>
 
 #include "readtex.h"
diff --git a/src/demos/renormal.c b/src/demos/renormal.c
index 61dd860..ba63a67 100644
--- a/src/demos/renormal.c
+++ b/src/demos/renormal.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <GL/glew.h> /* for GL_RESCALE_NORMAL_EXT */
 #include <GL/glut.h>
 
 
diff --git a/src/demos/tessdemo.c b/src/demos/tessdemo.c
index f2dcee7..db66bd8 100644
--- a/src/demos/tessdemo.c
+++ b/src/demos/tessdemo.c
@@ -7,20 +7,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <GL/glew.h> /* for GLAPIENTRY */
 #include <GL/glut.h>
 
 #define MAX_POINTS	256
 #define MAX_CONTOURS	32
 #define MAX_TRIANGLES	256
 
-#ifndef GLCALLBACK
-#ifdef CALLBACK
-#define GLCALLBACK CALLBACK
-#else
-#define GLCALLBACK
-#endif
-#endif
-
 #ifdef GLU_VERSION_1_2
 
 typedef enum{ QUIT, TESSELATE, CLEAR } menu_entries;
@@ -50,7 +43,7 @@ static struct {
 
 
 
-static void GLCALLBACK error_callback( GLenum err )
+static void GLAPIENTRY error_callback( GLenum err )
 {
    int		len, i;
    char const	*str;
@@ -66,14 +59,14 @@ static void GLCALLBACK error_callback( GLenum err )
    }
 }
 
-static void GLCALLBACK begin_callback( GLenum mode )
+static void GLAPIENTRY begin_callback( GLenum mode )
 {
    /* Allow multiple triangles to be output inside the begin/end pair. */
    triangle_cnt = 0;
    triangles[triangle_cnt].no = 0;
 }
 
-static void GLCALLBACK edge_callback( GLenum flag )
+static void GLAPIENTRY edge_callback( GLenum flag )
 {
    /* Persist the edge flag across triangles. */
    if ( flag == GL_TRUE ) {
@@ -87,7 +80,7 @@ static void GLCALLBACK edge_callback( GLenum flag )
    }
 }
 
-static void GLCALLBACK end_callback(void)
+static void GLAPIENTRY end_callback(void)
 {
    GLuint	i;
 
@@ -121,7 +114,7 @@ static void GLCALLBACK end_callback(void)
    glEnd();
 }
 
-static void GLCALLBACK vertex_callback( void *data )
+static void GLAPIENTRY vertex_callback( void *data )
 {
    GLsizei	no;
    GLfloat	*p;
@@ -143,7 +136,7 @@ static void GLCALLBACK vertex_callback( void *data )
    }
 }
 
-static void GLCALLBACK combine_callback( GLdouble coords[3],
+static void GLAPIENTRY combine_callback( GLdouble coords[3],
 					 GLdouble *vertex_data[4],
 					 GLfloat weight[4], void **data )
 {
@@ -164,8 +157,6 @@ static void set_screen_wh( GLsizei w, GLsizei h )
    height = h;
 }
 
-typedef void (GLAPIENTRY *callback_t)(void);
-
 static void tesse( void )
 {
    GLUtesselator	*tobj;
@@ -178,11 +169,11 @@ static void tesse( void )
 
    if ( tobj != NULL ) {
       gluTessNormal( tobj, 0.0, 0.0, 1.0 );
-      gluTessCallback( tobj, GLU_TESS_BEGIN, (callback_t) glBegin );
-      gluTessCallback( tobj, GLU_TESS_VERTEX, (callback_t) glVertex2fv );
-      gluTessCallback( tobj, GLU_TESS_END, (callback_t) glEnd );
-      gluTessCallback( tobj, GLU_TESS_ERROR, (callback_t) error_callback );
-      gluTessCallback( tobj, GLU_TESS_COMBINE, (callback_t) combine_callback );
+      gluTessCallback( tobj, GLU_TESS_BEGIN, (_GLUfuncptr) glBegin );
+      gluTessCallback( tobj, GLU_TESS_VERTEX, (_GLUfuncptr) glVertex2fv );
+      gluTessCallback( tobj, GLU_TESS_END, (_GLUfuncptr) glEnd );
+      gluTessCallback( tobj, GLU_TESS_ERROR, (_GLUfuncptr) error_callback );
+      gluTessCallback( tobj, GLU_TESS_COMBINE, (_GLUfuncptr) combine_callback );
 
       glNewList( list_start, GL_COMPILE );
       gluBeginPolygon( tobj );
@@ -202,10 +193,10 @@ static void tesse( void )
       gluEndPolygon( tobj );
       glEndList();
 
-      gluTessCallback( tobj, GLU_TESS_BEGIN, (callback_t) begin_callback );
-      gluTessCallback( tobj, GLU_TESS_VERTEX, (callback_t) vertex_callback );
-      gluTessCallback( tobj, GLU_TESS_END, (callback_t) end_callback );
-      gluTessCallback( tobj, GLU_TESS_EDGE_FLAG, (callback_t) edge_callback );
+      gluTessCallback( tobj, GLU_TESS_BEGIN, (_GLUfuncptr) begin_callback );
+      gluTessCallback( tobj, GLU_TESS_VERTEX, (_GLUfuncptr) vertex_callback );
+      gluTessCallback( tobj, GLU_TESS_END, (_GLUfuncptr) end_callback );
+      gluTessCallback( tobj, GLU_TESS_EDGE_FLAG, (_GLUfuncptr) edge_callback );
 
       glNewList( list_start + 1, GL_COMPILE );
       gluBeginPolygon( tobj );
diff --git a/src/demos/texenv.c b/src/demos/texenv.c
index 260ca87..72f1724 100644
--- a/src/demos/texenv.c
+++ b/src/demos/texenv.c
@@ -49,6 +49,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <GL/glew.h> /* for GL_BGRA */
 #include <GL/glut.h>
 
 #undef max