Removing the build errors and a build warning that crept in for MSVC 6.0. There remain the undefined functions "sinf" and "cosf".

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1231 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-04-01 20:09:51 +00:00
parent 3123ddca88
commit c85f5937dd
2 changed files with 4 additions and 4 deletions

View File

@ -73,6 +73,8 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
GLuint vbo_coords, vbo_normals; GLuint vbo_coords, vbo_normals;
GLuint numVertices = numFaces * numEdgePerFace; GLuint numVertices = numFaces * numEdgePerFace;
int i;
if (numVertices > 0 && attribute_v_coord != -1) { if (numVertices > 0 && attribute_v_coord != -1) {
fghGenBuffers(1, &vbo_coords); fghGenBuffers(1, &vbo_coords);
fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
@ -113,9 +115,6 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
); );
} }
int i;
/* Draw per face (TODO: could use glMultiDrawArrays if available) */ /* Draw per face (TODO: could use glMultiDrawArrays if available) */
for (i=0; i<numFaces; i++) for (i=0; i<numFaces; i++)
glDrawArrays(GL_LINE_LOOP, i*numEdgePerFace, numEdgePerFace); glDrawArrays(GL_LINE_LOOP, i*numEdgePerFace, numEdgePerFace);

View File

@ -102,6 +102,7 @@ extern void fgPlatformInitialize( const char* displayName );
extern void fgPlatformDeinitialiseInputDevices ( void ); extern void fgPlatformDeinitialiseInputDevices ( void );
extern void fgPlatformCloseDisplay ( void ); extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext ); extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
extern void fgInitGL2();
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry ) void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )