Resolve bug 806008 -- let Microsoft's compiler know to use Windows libraries even...

[freeglut] / include / GL / glut.h

diff --git a/include/GL/glut.h b/include/GL/glut.h
index 06ceae8..d05d597 100644 (file)
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -1,5 +1,5 @@
-#ifndef  GLUT_H
-#define  GLUT_H
+#ifndef  __GLUT_H__
+#define  __GLUT_H__
 
 /*
  * freeglut.h
@@ -60,9 +60,12 @@
 #endif
 
 #pragma comment (lib, "winmm.lib")       /* link with Windows MultiMedia lib */
+#pragma comment (lib, "user32.lib") /* link with Windows user lib */
+#pragma comment (lib, "gdi32.lib") /* link with Windows GDI lib */
 #pragma comment (lib, "opengl32.lib")    /* link with Microsoft OpenGL lib */
 #pragma comment (lib, "glu32.lib")       /* link with OpenGL Utility lib */
 
+
 #else
 #      define FGAPI
 #      define FGAPIENTRY
@@ -164,15 +167,15 @@
     /*
      * I don't really know if it's a good idea... But here it goes:
      */
-    extern struct _GLUTstrokeFont glutStrokeRoman;
-    extern struct _GLUTstrokeFont glutStrokeMonoRoman;
-    extern struct _GLUTbitmapFont glutBitmap9By15;
-    extern struct _GLUTbitmapFont glutBitmap8By13;
-    extern struct _GLUTbitmapFont glutBitmapTimesRoman10;
-    extern struct _GLUTbitmapFont glutBitmapTimesRoman24;
-    extern struct _GLUTbitmapFont glutBitmapHelvetica10;
-    extern struct _GLUTbitmapFont glutBitmapHelvetica12;
-    extern struct _GLUTbitmapFont glutBitmapHelvetica18;
+    extern void* glutStrokeRoman;
+    extern void* glutStrokeMonoRoman;
+    extern void* glutBitmap9By15;
+    extern void* glutBitmap8By13;
+    extern void* glutBitmapTimesRoman10;
+    extern void* glutBitmapTimesRoman24;
+    extern void* glutBitmapHelvetica10;
+    extern void* glutBitmapHelvetica12;
+    extern void* glutBitmapHelvetica18;
 
     /*
      * Those pointers will be used by following definitions:
@@ -467,8 +470,8 @@ FGAPI void    FGAPIENTRY glutBitmapCharacter( void* font, int character );
 FGAPI int     FGAPIENTRY glutBitmapWidth( void* font, int character );
 FGAPI void    FGAPIENTRY glutStrokeCharacter( void* font, int character );
 FGAPI int     FGAPIENTRY glutStrokeWidth( void* font, int character );
-FGAPI int     FGAPIENTRY glutBitmapLength( void* font, const char* string );
-FGAPI int     FGAPIENTRY glutStrokeLength( void* font, const char* string );
+FGAPI int     FGAPIENTRY glutBitmapLength( void* font, const unsigned char* string );
+FGAPI int     FGAPIENTRY glutStrokeLength( void* font, const unsigned char* string );
 
 /*
  * Geometry functions, see freeglut_geometry.c
@@ -540,5 +543,5 @@ FGAPI void    FGAPIENTRY glutReportErrors( void );
 
 /*** END OF FILE ***/
 
-#endif /* GLUT_H */
+#endif /* __GLUT_H__ */