Mods for HP-UX port.

Make/makedefs

@@ -49,13 +49,7 @@ INST_DOC           = $(INST_SHARE_PREFIX)/OpenSceneGraph/doc
 INST_DATA          = $(INST_SHARE_PREFIX)/OpenSceneGraph/data
 INST_DEMO_SRC      = $(INST_SRC)/demos
 
-ifneq ($(OS),HP-UX)
 LINK               = ln -sf
-else
-# HP-UX linker seems to have problems with symlinked libs -
-# somehow paths like "../../.." get into the executables
-LINK               = cp -f
-endif
 INSTBINCMD         = install -m 755
 INSTDEVCMD         = install -m 644
 INSTLINKBINCMD     = $(LINK)
@@ -467,25 +461,11 @@ ifeq ($(OS),HP-UX)
   SHARED            = -shared -fPIC
   ARCH              = 32
 ifeq ($(ARCH),64)
-	# not yet tested
+    # not yet tested
     ARCHARGS          = -march=2.0
-	# I don't have performer - just a wild guess of the directory
-    PF_XTRA_LIBS      = -L/opt/graphics/libpfdb   -Wl,-rpath -Wl,/opt/graphics/libpfdb \
-                      -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 -limage
 else
-    # at least my gcc 3.1 defaults to HP-PA RISC 1.1
-    ARCHARGS          = 
-	# I don't have performer - just a wild guess of the directory
-    PF_XTRA_LIBS      = -L/opt/graphics/libpfdb   -Wl,-rpath -Wl,/usr/lib64/libpfdb \
-                      -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 -limage
+   # at least my gcc 3.1 defaults to HP-PA RISC 1.1
+  ARCHARGS          = 
 endif
   LINKARGS          = -lpthread
   LIB_EXT           = sl

Make/makerules

@@ -75,7 +75,7 @@ ifeq ($(OS),HP-UX)
 # we need to explicitly tell the linker the library name - else it will
 # include paths like ../../../libosg.sl into executables
 $(LIB) $(PLUGIN) : $(OBJS)
-	$(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -Wl,+h -Wl,$@ -Wl,-v -o $@
+	$(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -Wl,+h -Wl,$@ -o $@
 else
 $(LIB) $(PLUGIN) : $(OBJS)
 	$(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -o $@

include/osg/Math

@@ -7,7 +7,7 @@
 
 #include <math.h>
 
-#if defined(WIN32) || defined (macintosh)|| defined (sun) || defined (__DARWIN_OSX__) || defined(__hpux__)
+#if defined(WIN32) || defined (macintosh)|| defined (sun) || defined (__DARWIN_OSX__)
 
     #include <float.h>
 
@@ -36,9 +36,6 @@
     #define logf (float)log
     #endif
 
-    #ifndef floorf
-    #define floorf (float)floor
-    #endif
 
     #ifndef powf
     #define powf (float)pow
@@ -55,6 +52,14 @@
     #ifndef isnanf
     #define isnanf (float)isnan
     #endif
+    
+#endif
+
+#if defined(WIN32) || defined (macintosh)|| defined (sun) || defined (__DARWIN_OSX__) || defined (__hpux__)
+
+    #ifndef floorf
+    #define floorf (float)floor
+    #endif
 
 #endif