Fixes for Mac OS X

src/Demos/osglogo/osglogo.cpp

@@ -45,7 +45,7 @@ class MyBillboardTransform : public osg::PositionAttitudeTransform
                 osg::Vec3 side = _axis^_normal;
                 side.normalize();
 
-                float angle = atan2f(eyevector*_normal,eyevector*side);
+                float angle = atan2(eyevector*_normal,eyevector*side);
                 billboardRotation.makeRotate(osg::PI_2-angle,_axis);
 
             }

src/osgDB/Field.cpp

@@ -59,7 +59,7 @@ void Field::_init()
     _fieldCacheSize = 0;
     _fieldCache = NULL;
 
-    _fieldType = UNINTIALISED;
+    _fieldType = UNINITIALISED;
 
     _withinQuotes = false;
 
@@ -97,7 +97,7 @@ void Field::_copy(const Field& ic)
 void Field::setWithinQuotes(bool withinQuotes)
 {
     _withinQuotes=withinQuotes;
-    _fieldType = UNINTIALISED;
+    _fieldType = UNINITIALISED;
 }
 
 
@@ -133,7 +133,7 @@ char* Field::takeStr()
     _fieldCache = NULL;
     _fieldCacheSize = 0;
 
-    _fieldType = UNINTIALISED;
+    _fieldType = UNINITIALISED;
     _withinQuotes = false;
 
     return field;
@@ -175,13 +175,13 @@ void Field::addChar(char c)
     }
     _fieldCache[_fieldCacheSize++] = c;
     _fieldCache[_fieldCacheSize] = 0;
-    _fieldType = UNINTIALISED;
+    _fieldType = UNINITIALISED;
 }
 
 
 Field::FieldType Field::getFieldType() const
 {
-    if (_fieldType==UNINTIALISED && _fieldCache)
+    if (_fieldType==UNINITIALISED && _fieldCache)
     {
         _fieldType = calculateFieldType(_fieldCache,_withinQuotes);
     }

src/osgPlugins/quicktime/GNUmakefile

@@ -1,8 +1,8 @@
 TOPDIR = ../../..
 include $(TOPDIR)/Make/makedefs 
 
-CXXFILES = ReaderWriterQT.cpp
-CFILES = QTtexture.c
+CXXFILES = ReaderWriterQT.cpp\
+		   QTtexture.cpp
 
 LIBS  += $(QUICKTIME) $(OSG_LIBS) $(OTHER_LIBS)
 

src/osgProducer/GNUmakefile

@@ -11,6 +11,7 @@ CXXFILES =\
 
 LIBS += -lProducer $(GL_LIBS) -losgGA -losgUtil -losgDB -losg $(OTHER_LIBS)
 DEF  += -DOSGPRODUCER_LIBRARY
+INC  += -I/usr/X11R6/include
 TARGET_BASENAME = osgProducer
 LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)