Fixes for IRIX build.

Fix for a warning under VisualStudio.NET.
This commit is contained in:
Robert Osfield
2002-04-25 22:09:28 +00:00
parent a1a1876875
commit 2bd20f5c6f
3 changed files with 10 additions and 3 deletions

View File

@@ -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

View File

@@ -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. */

View File

@@ -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