First batch of changes required for MacOS X build. Orignal submission from

Phil Atkin, merged by Robert Osfield.

src/osgPlugins/Makefile

@@ -6,6 +6,9 @@ DIRS = osg rgb lib3ds flt obj lwo dw bmp pic tga osgtgz tgz zip
 # comment in if you have Performer installed.
 # DIRS += pfb
 
+# comment in if you have Performer installed.
+# DIRS += quicktime
+
 # comment in if you have libpng installed.
 DIRS += png
 

src/osgPlugins/dw/ReaderWriterDW.cpp

@@ -26,7 +26,7 @@
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
 
-#include <GL/glu.h>
+#include <osg/GLU>
 
 using namespace osg;
 

src/osgPlugins/flt/Input.cpp

@@ -1,7 +1,7 @@
 // Input.cpp
 
 #include <string>
-#include <malloc.h>
+// #include <malloc.h>
 
 #include <osg/Notify>
 #include <osgDB/FileUtils>

src/osgPlugins/flt/Record.cpp

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 #include <stdio.h>
-#include <malloc.h>
+#include <string.h>
 
 #include <osg/Notify>
 

src/osgPlugins/obj/glm.cpp

@@ -12,7 +12,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <osg/Math>
+#ifdef __DARWIN_OSX__
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 #include "glm.h"