*** empty log message ***

svn path=/trunk/boinc/; revision=945
MrBrain295 · Feb 19, 2003 · bc26be3 · bc26be3
1 parent 8d5ab55
commit bc26be3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/api/gutil.cpp b/api/gutil.cpp
@@ -1,8 +1,15 @@
+#include <stdlib.h>
+#include <string.h>
 #include <math.h>
-#include <windows.h>
+#ifdef _WIN32
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glut.h>
+#endif
+#ifdef __APPLE_CC__
+#include <OpenGL/gl.h>
+#include <GLUT/glut.h>
+#endif
 
 #include "gutil.h"
 
@@ -205,4 +212,5 @@ void draw_text_panel(
     pos3[2] += 0.01;
     glColor3f(1, 1, 1);
     draw_text(pos3, char_height, line_width, line_spacing, text);
-}
+}
+
diff --git a/apps/upper_case.C b/apps/upper_case.C
@@ -55,9 +55,7 @@
 #include <GL/glu.h>
 #endif
 
-bool app_render(int xs, int ys, double time_of_day);
 void renderBitmapString(float x, float y, void *font, char *string);
-int DrawGLScene(GLvoid);
 #endif
 
 #include "util.h"
@@ -238,7 +236,7 @@ int main(int argc, char **argv) {
 #ifdef BOINC_APP_GRAPHICS
 extern GLuint			main_font;
 
-int DrawGLScene(GLvoid)      // Here's Where We Do All The Drawing
+bool app_render(int xs, int ys, double time_of_day)
 {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);    // Clear Screen And Depth Buffer
     glLoadIdentity();                                    // Reset The Current Modelview Matrix