Integrated changes for MacOSX, submitted by Phil Atkin, with small mods by

Robert Osfield to maintain compatability under Linux.
2001-10-03 21:44:07 +00:00
parent 1ebddc2af7
commit 2c6e85442b
29 changed files with 395 additions and 91 deletions
--- a/src/Demos/hangglide/hangglide.cpp
+++ b/src/Demos/hangglide/hangglide.cpp
@@ -7,7 +7,7 @@
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>

-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>

 #include "GliderManipulator.h"
--- a/src/Demos/hangglide/hat.cpp
+++ b/src/Demos/hangglide/hat.cpp
@@ -3,8 +3,8 @@
 #pragma warning( disable : 4244 )
 #endif

-#include <GL/gl.h>
-#include <math.h>
+#include <osg/GL>
+#include <osg/Math>
 #include <stdio.h>

 #include "terrain_data.h"
--- a/src/Demos/osgcube/osgcube.cpp
+++ b/src/Demos/osgcube/osgcube.cpp
@@ -10,10 +10,9 @@
 #include <osgUtil/TrackballManipulator>

 #include <osgGLUT/Viewer>
+#include <osgGLUT/glut>

-#include <GL/glut.h>
-
-#include <math.h>
+#include <osg/Math>

 // ----------------------------------------------------------------------
 // Global variables - this is basically the stuff which will be animated
--- a/src/Demos/osgreflect/osgreflect.cpp
+++ b/src/Demos/osgreflect/osgreflect.cpp
@@ -16,7 +16,7 @@
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>

-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>


--- a/src/Demos/sgv/sgv.cpp
+++ b/src/Demos/sgv/sgv.cpp
@@ -12,7 +12,7 @@
 #include <osgUtil/FlightManipulator>
 #include <osgUtil/DriveManipulator>

-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>

 #include <osgUtil/OptimizeStateVisitor>