summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Hughes <[email protected]>2001-03-21 02:47:32 +0000
committerGareth Hughes <[email protected]>2001-03-21 02:47:32 +0000
commitfa6be6e77a25236481dd78c6912f4bfefeda8b17 (patch)
tree8d8e413d2623afc47eb7ded92685a77bebf8b2e2
parentf5328c534d6f2c296b95d2cad5da16434d270dfd (diff)
Fix compilation with GLU 1.1
-rw-r--r--progs/demos/tessdemo.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/progs/demos/tessdemo.c b/progs/demos/tessdemo.c
index 99f5006d60a..0659b382c7f 100644
--- a/progs/demos/tessdemo.c
+++ b/progs/demos/tessdemo.c
@@ -1,4 +1,4 @@
-/* $Id: tessdemo.c,v 1.10 2001/03/21 02:44:36 gareth Exp $ */
+/* $Id: tessdemo.c,v 1.11 2001/03/21 02:47:32 gareth Exp $ */
/*
* A demo of the GLU polygon tesselation functions written by Bogdan Sikorski.
@@ -479,6 +479,8 @@ static void reshape( GLsizei w, GLsizei h )
set_screen_wh( w, h );
}
+#endif
+
static void usage( void )
{
@@ -487,8 +489,6 @@ static void usage( void )
printf( "Select tesselate from the pop-up menu.\n" );
}
-#endif
-
int main( int argc, char **argv )
{
@@ -506,12 +506,16 @@ int main( int argc, char **argv )
glutInitWindowSize( 400, 400 );
glutCreateWindow( argv[0] );
+ /* GH: Bit of a hack...
+ */
+#ifdef GLU_VERSION_1_2
myinit();
glutDisplayFunc( display );
glutReshapeFunc( reshape );
glutMainLoop();
+#endif
return 0;
}