FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for IRIX build - submitted by Randall Hopper.

Browse Source
This commit is contained in:
Robert Osfield
2001-10-16 18:39:57 +00:00
parent ada36c3462
commit 2ce6cdd6b2
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Make/makedefs.irix.std
View File

@@ -20,7 +20,7 @@ LDFLAGS = -O2 -n32 -LANG:std -OPT:Olimit=0
$(C++) $(C++FLAGS) -c $<
DYNAMICLIBRARYLIB =
PFLIBS = -lpfdu -lpfutil -lpf -limage
PFLIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb -lpfpfb -lpfdu -lpfutil -lpf -limage
GLUTLIB = -lglut
#

4
src/osgPlugins/flt/GeoSetBuilder.cpp
View File

@@ -596,7 +596,7 @@ void TmpGeoSet::setVertex(osg::GeoSet* gset, int index, Record* vertex)
{
osg::Vec4* colors = gset->getColors();
ColorPool* pColorPool = _pFltFile->getColorPool();
if (pColorPool && (pVert->color_index >= 0))
if (pColorPool)
colors[index] = pColorPool->getColor(pVert->color_index);
else
colors[index] = _appearance.getFaceColor();
@@ -631,7 +631,7 @@ void TmpGeoSet::setVertex(osg::GeoSet* gset, int index, Record* vertex)
{
osg::Vec4* colors = gset->getColors();
ColorPool* pColorPool = _pFltFile->getColorPool();
if (pColorPool && (pVert->color_index >= 0))
if (pColorPool)
colors[index] = pColorPool->getColor(pVert->color_index);
else
colors[index] = _appearance.getFaceColor();

4
src/osgPlugins/flt/ReaderWriterFLT.h
View File

@@ -54,8 +54,8 @@ public:
return osgDB::equalCaseInsensitive(extension,"flt");
}
virtual osg::Object* readObject(const std::string& fileName, const ReaderWriter::Options*);
virtual osg::Node* readNode(const std::string& fileName, const ReaderWriter::Options*);
virtual osg::Object* readObject(const std::string& fileName, const osgDB::ReaderWriter::Options*);
virtual osg::Node* readNode(const std::string& fileName, const osgDB::ReaderWriter::Options*);
};

7
src/osgPlugins/pfb/Makefile
View File

@@ -10,12 +10,7 @@ C++FILES = \
LIB = ../../../lib/osgPlugins/osgdb_pfb.so
LIBS = \
/usr/lib/Performer/Static/libpfdb/libpfpfb.a\
/usr/lib/Performer/Static/libpfdu.a\
/usr/lib/Performer/Static/libpfutil.a\
/usr/lib/Performer/Static/libpf.a\
-losg -losgDB
LIBS = -losg -losgDB $(PFLIBS)
TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.so