Fixes for Mac OS X

Make/instdemosrc

@@ -21,6 +21,8 @@ shift; shift; shift; shift; shift; shift; shift; shift;
 OTHER_LIBS=$1
 TIFF_LIB=$2
 
+[ "`uname`" = "Darwin" ] && MAKE=make || MAKE=gmake
+
 
 copy_demo_source()
 {
@@ -32,7 +34,7 @@ copy_demo_source()
             cd $TOPDIR/src/Demos/$d
             [ -d $INST_DEMO_SRC/$d ] || mkdir -m 0755 -p $INST_DEMO_SRC/$d
             echo "         installing $d"
-            for f in `gmake __instfiles | grep -v gmake`
+            for f in `$MAKE __instfiles | grep -v $MAKE`
            do
                 src=`echo $f | cut -f1 -d"="`
                 dst=`echo $f | cut -f2 -d"="`

Make/makedirrules

@@ -1,6 +1,6 @@
 
 default : $(DIRS)
-	@for f in $(DIRS); do cd $$f; $(MAKE) $@ || exit 1; cd ..; done
+	@for f in $(DIRS); do echo "Entering directory $$f"; cd $$f; $(MAKE) $@ || exit 1; cd ..; done
 
 $(RECURSIVE_TARGETS) :  $(DIRS)
-	@for f in $(DIRS); do cd $$f; $(MAKE) $@ || exit 1; cd ..; done
+	@for f in $(DIRS); do echo "Entering directory $$f"; cd $$f; $(MAKE) $@ || exit 1; cd ..; done

Make/makerules

@@ -179,7 +179,7 @@ endif
 depend : $(MAKEDEPEND)
 
 __link : 
-	sh $(TOPDIR)/Make/dolink.sh $(TOPDIR) $(LNSRC) $(LNDEST) "$(LINK)"
+	@sh $(TOPDIR)/Make/dolink.sh $(TOPDIR) $(LNSRC) $(LNDEST) "$(LINK)"
 		
 __instfiles :
 	@echo $(INSTFILES)

examples/osgcameragroup/GNUmakefile

@@ -12,8 +12,8 @@ INSTFILES = \
 
 EXEC = osgcameragroup
 
-INC += $(PRODUCER_INCLUDE_DIR)
+INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+LDFLAGS  += $(PRODUCER_LIB_DIR) -L/usr/X11R6/lib
 
 include $(TOPDIR)/Make/makerules 
 

include/osg/Vec2

@@ -136,7 +136,7 @@ class Vec2
         /// Length of the vector = sqrt( vec . vec )
 	inline float length() const
 	{
-	    return sqrtf( _v[0]*_v[0] + _v[1]*_v[1] );
+	    return sqrt( _v[0]*_v[0] + _v[1]*_v[1] );
 	}
 
         /// Length squared of the vector = vec . vec

include/osgDB/Field

@@ -55,7 +55,7 @@ class OSGDB_EXPORT Field
             REAL,
             INTEGER,
             BLANK,
-            UNINTIALISED
+            UNINITIALISED
         };
 
         FieldType getFieldType() const;

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
+CXXFILES = ReaderWriterQT.cpp\
-CFILES = QTtexture.c
+		   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)