X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Fglut.h;h=06ceae8d911d523a19107edd2c70acfaf5892e93;hb=14d79028cc56ade3c5988b66178bc8fbb77e5d6f;hp=b694c78700aae62d9c905d8162eb2e3832fe8b44;hpb=60fc701ac5ebd652058a209dac1486d4c5089662;p=freeglut diff --git a/include/GL/glut.h b/include/GL/glut.h index b694c78..06ceae8 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -73,11 +73,7 @@ */ #define FREEGLUT 1 #define GLUT_API_VERSION 4 -#define FREEGLUT_VERSION_1_3 1 - -#define VERSION_MAJOR 1 -#define VERSION_MINOR 4 -#define VERSION_PATCH 0 +#define FREEGLUT_VERSION_2_0 1 /* * Always include OpenGL and GLU headers @@ -168,15 +164,15 @@ /* * I don't really know if it's a good idea... But here it goes: */ - 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; + 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; /* * Those pointers will be used by following definitions: