From 2bd20f5c6f0731ccd6594ee91f043b3269629b9b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 25 Apr 2002 22:09:28 +0000 Subject: [PATCH] Fixes for IRIX build. Fix for a warning under VisualStudio.NET. --- Make/makedefs | 9 ++++++++- include/osg/Node | 2 +- src/osgPlugins/pfb/Makefile | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index 4cb5ab701..0702f1f04 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -130,13 +130,19 @@ ifeq ($(ARCH),64) else ARCHARGS = -n32 endif - LINKARGS = -LANG:std -OPT:Olimit=0 -L/usr/local/lib32 -rpath /usr/local/lib32 + LINKARGS = -LANG:std -OPT:Olimit=0 -L/usr/local/lib32 -rpath /usr/local/lib32 -rpath $(INST_LIBS) DYNAMICLIBRARYLIB = -ldl OSG_LIBS = -losgGLUT -losgDB -losgUtil -losg FREETYPE_LIB = -lfreetype GLUT_LIB = -lglut GL_LIBS = -lGLU -lGL X_LIBS = -lXext -lXi -lXmu -lX11 + PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/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 SOCKET_LIBS = OTHER_LIBS = -lm @@ -166,6 +172,7 @@ endif GLUT_LIB = -lglut GL_LIBS = -lGLU -lGL X_LIBS = -lXi -lXmu -lX11 + PF_XTRA_LIBS = SOCKET_LIBS = OTHER_LIBS = PNG_LIBS = -lpng diff --git a/include/osg/Node b/include/osg/Node index 0cdff6fae..5a8986d1c 100644 --- a/include/osg/Node +++ b/include/osg/Node @@ -95,7 +95,7 @@ class SG_EXPORT Node : public Object * Get the number of parents of node. * @return the number of parents of this node. */ - inline const int getNumParents() const { return _parents.size(); } + inline const unsigned int getNumParents() const { return _parents.size(); } /** Set app node callback, called during app traversal. */ diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile index 2ae8fe44c..9a44f6b41 100644 --- a/src/osgPlugins/pfb/Makefile +++ b/src/osgPlugins/pfb/Makefile @@ -6,7 +6,7 @@ CXXFILES =\ ConvertToPerformer.cpp\ ReaderWriterPFB.cpp\ -LIBS += $(OSG_LIBS) $(OTHER_LIBS) +LIBS += $(OSG_LIBS) $(PF_XTRA_LIBS) (OTHER_LIBS) TARGET_BASENAME = pfb include $(TOPDIR)/Make/cygwin_plugin_def