Build Fixes for IRIX.

Make/makedefs

@@ -205,6 +205,8 @@ endif
 
 #### IRIX Specific definitions
 ifeq ($(OS),IRIX)
+	CXX = CC
+	ifeq ($(CXX),CC)
 		LINKARGS          = -L${TOPDIR}/lib -LANG:std -OPT:Olimit=0  
 		C++               = CC
 		DEPARG            = -M
@@ -236,6 +238,37 @@ ifeq ($(OS),IRIX)
 			PF_XTRA_LIBS      = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \
 			                     $(PFLIBS)
 		endif
+	else		
+	 	LIBS              = -lstdc++
+		LINKARGS          = -L${TOPDIR}/lib  
+		C++               = g++
+		INC               += -I${TOPDIR}/include -I/usr/freeware/include
+		DEF               += -fPIC -W -Wno-unused 
+		OPTF              = -O2 
+		DBGF              = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS  
+		SHARED            = -shared
+		PFLIBS            = \
+		                  -lpf3ds -lpfdem -lpfdted -lpfdwb -lpfdxf -lpfevt \
+		                  -lpfflt -lpfgds -lpfgfo -lpfim -lpflsa -lpflsb \
+		                  -lpfnff -lpfobj -lpfpegg -lpfpfb -lpfphd -lpfpts \
+		                  -lpfrot -lpfscale -lpfsgf -lpfsgo -lpfsphere -lpfsv \
+		                  -lpftri -lpfunc -lpfvct -lpfdu -lpfutil -lpf -all -limage
+		FREETYPE_LIB      = -lfreetype
+		ARCH              = 32
+		ifeq ($(ARCH),64)
+			ARCHARGS          = -mabi=64 -mips4 -DARCH64
+			ARCHINST          = 64
+			LINKARGS          += -L/usr/freeware/lib64
+			PF_XTRA_LIBS      = -L/usr/lib64/libpfdb -rpath /usr/lib64/libpfdb \
+			                     $(PFLIBS)
+		else 
+			ARCHARGS          = -mabi=n32 -mips4
+			ARCHINST          = 32
+			LINKARGS          += -L/usr/freeware/lib32
+			PF_XTRA_LIBS      = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb \
+			                     $(PFLIBS)
+		endif	
+	endif
 
 	DYNAMICLIBRARYLIB = 
 	OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
@@ -249,6 +282,7 @@ ifeq ($(OS),IRIX)
 	TIFF_LIB          = -ltiff
 	GIF_LIBS          = -lungif
 	MAKEDIST          = $(TOPDIR)/Make/makeirixdist
+
 endif
 
 #### Linux specific definitions

examples/osgscalarbar/GNUmakefile

@@ -12,7 +12,6 @@ INSTFILES = \
 
 EXEC = osgscalarbar
 
-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(X_INC)
-LDFLAGS  += $(PRODUCER_LIB_DIR)
 
 include $(TOPDIR)/Make/makerules 

examples/osgscalarbar/GNUmakefile.inst

@@ -8,7 +8,6 @@ LIBS     += -losgText -losgProducer -lProducer -losgDB -losgText -losgUtil -losg
 
 EXEC = osgscalarbar
 
-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(X_INC)
-LDFLAGS  += $(PRODUCER_LIB_DIR)
 
 include $(TOPDIR)/Make/makerules

examples/osgspheresegment/GNUmakefile

@@ -12,7 +12,6 @@ INSTFILES = \
 
 EXEC = osgspheresegment
 
-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(X_INC)
-LDFLAGS  += $(PRODUCER_LIB_DIR)
 
 include $(TOPDIR)/Make/makerules 

examples/osgspheresegment/GNUmakefile.inst

@@ -8,7 +8,6 @@ LIBS     += -losgText -losgProducer -lProducer -losgDB -losgText -losgUtil -losg
 
 EXEC = osgspheresegment
 
-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(X_INC)
-LDFLAGS  += $(PRODUCER_LIB_DIR)
 
 include $(TOPDIR)/Make/makerules

examples/osgviewer/GNUmakefile.inst

@@ -8,7 +8,6 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS
 
 EXEC = osgviewer
 
-INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
+INC += $(X_INC)
-LDFLAGS  += $(PRODUCER_LIB_DIR)
 
 include $(TOPDIR)/Make/makerules

include/osg/Timer

@@ -193,7 +193,11 @@ class SG_EXPORT Timer {
                     unsigned long clockValue = *_clockAddress_32;
                     if( _lastClockValue > clockValue )
                     {
+                        # ifdef __GNUC__
+                        _rollOver += 0x100000000LL;
+                        #else
                         _rollOver += 0x100000000L;
+                        #endif
                     }
                     _lastClockValue = clockValue;
                     return _rollOver + clockValue;

include/osgFX/Validator

@@ -15,7 +15,7 @@
 #ifndef OSGFX_VALIDATOR_
 #define OSGFX_VALIDATOR_
 
-#include <osgFX/Export>
+#include <osgFX/Effect>
 
 #include <osg/ref_ptr>
 #include <osg/StateAttribute>
@@ -25,9 +25,6 @@
 namespace osgFX
 {
 
-    // forward declaration
-    class Effect;
-
     /**
      This class is used internally by osgFX::Effect to choose between different
      techniques dynamically. The apply() method will call each technique's

src/osg/Timer.cpp

@@ -160,7 +160,6 @@ const Timer* Timer::instance()
     #include <unistd.h>
     #include <sys/types.h>
     #include <sys/syssgi.h>
-    #include <sys/immu.h>
     #include <sys/mman.h>
 
     Timer::Timer( void )