diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile index f48575df1..a8574b937 100644 --- a/src/osgPlugins/pfb/Makefile +++ b/src/osgPlugins/pfb/Makefile @@ -1,6 +1,8 @@ #!smake include ../../../Make/makedefs +CFILES = \ + C++FILES = \ ConvertFromPerformer.cpp\ ConvertToPerformer.cpp\ @@ -8,16 +10,26 @@ C++FILES = \ LIB = ../../../lib/osgPlugins/osgdb_pfb.so -#LIBS = -u __ucmpdi2 -lgcc -losg -losgDB ${PFLIBS} -LIBS = -losg -losgDB ${PFLIBS} +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 TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.so -C++FLAGS += -I../../../include +C++FLAGS += -g -I../../../include -LDFLAGS += -L../../../lib -L/usr/X11R6/lib +LDFLAGS += -g -L../../../lib -L/usr/X11R6/lib + +PREREQUISITES = preq include ../../../Make/makerules +preq : + [ -f /usr/lib/blah ] || exit 1 + + diff --git a/src/osgPlugins/pfb/ReaderWriterPFB.cpp b/src/osgPlugins/pfb/ReaderWriterPFB.cpp index 38bbf17f1..970991b5a 100644 --- a/src/osgPlugins/pfb/ReaderWriterPFB.cpp +++ b/src/osgPlugins/pfb/ReaderWriterPFB.cpp @@ -13,6 +13,11 @@ #include #include +extern "C" { +extern pfNode *pfdLoadFile_pfb( const char *); +extern int pfdStoreFile_pfb( pfNode *, const char *); +} + class ReaderWriterPFB : public osgDB::ReaderWriter { @@ -67,13 +72,12 @@ class ReaderWriterPFB : public osgDB::ReaderWriter return NULL; } - virtual osg::Node* readNode(const std::string& fileName) + virtual osg::Node* readNode(const std::string& fileName, const osgDB::ReaderWriter::Options*) { osg::notify(osg::INFO)<< "ReaderWriterPFB::readNode( "<