From Ken Sewell, fixed for x86_64 build.
This commit is contained in:
@@ -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
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -765,7 +765,7 @@ class ReaderWriterATTR : public osgDB::ReaderWriter
|
||||
{
|
||||
// Get the character index of the FLT_VER option in the option
|
||||
// string
|
||||
unsigned int optionIndex = options->getOptionString().find("FLT_VER");
|
||||
std::string::size_type optionIndex = options->getOptionString().find("FLT_VER");
|
||||
|
||||
// Default to zero for the version if it's not found
|
||||
if (optionIndex == std::string::npos)
|
||||
|
||||
Reference in New Issue
Block a user