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

From Ken Sewell, fixed for x86_64 build.

Browse Source
This commit is contained in:
Robert Osfield
2005-06-13 11:14:42 +00:00
parent 3612da9fbc
commit 80a99a2559
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgDB/FileUtils.cpp
View File

@@ -592,7 +592,7 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st
CFBundleRef myBundle;
CFStringRef bundlePathString;
FSRef f;
OSErr errCode;
OSErr errCode;
// Start with the the Bundle PlugIns directory.
// Unlike the Cocoa API, it seems that the PlugIn path is relative
@@ -724,7 +724,7 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st
}
else
{
// had to comment out as it segfauls the OSX app otherwise
// had to comment out as it segfauls the OSX app otherwise
// osg::notify( osg::DEBUG_INFO ) << "Couldn't find the Network Application Support Path" << std::endl;
}
}
@@ -750,7 +750,12 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st
convertStringPathIntoFilePathList(ptr,filepath);
}
#if defined(__ia64__) || defined(__x86_64__)
convertStringPathIntoFilePathList("/usr/lib/:/usr/lib64/:/usr/local/lib/:/usr/local/lib64/",filepath);
#else
convertStringPathIntoFilePathList("/usr/lib/:/usr/local/lib/",filepath);
#endif
}