X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=2669006bddfaa65240570fcf289113235cc5e3ac;hb=f98bbe1aa03351d3e71d45473a20f3479281b3cd;hp=f5b1ebf8a398e79487d90cdd7f7a3f558dd208de;hpb=0779a259d0be8f014c378828ef844ae6f2c121e4;p=freeglut diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index f5b1ebf..2669006 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -525,18 +525,17 @@ FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri * Geometry functions, see freeglut_geometry.c */ -#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireCube( double size ); FGAPI void FGAPIENTRY glutSolidCube( double size ); -#endif -#ifndef EGL_VERSION_1_0 +#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireSphere( double radius, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutSolidSphere( double radius, GLint slices, GLint stacks ); +#endif +#ifndef EGL_VERSION_1_0 FGAPI void FGAPIENTRY glutWireCone( double base, double height, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks ); #endif -#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); FGAPI void FGAPIENTRY glutSolidTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); FGAPI void FGAPIENTRY glutWireDodecahedron( void ); @@ -547,7 +546,6 @@ FGAPI void FGAPIENTRY glutWireTetrahedron( void ); FGAPI void FGAPIENTRY glutSolidTetrahedron( void ); FGAPI void FGAPIENTRY glutWireIcosahedron( void ); FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); -#endif /* * Teapot rendering functions, found in freeglut_teapot.c