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

From Mathias Froechlich, "Attached the collected fixes I needed to compile with all of them.

Browse Source 
Most notable the __hpux define stuff. The __hpux__ variant seems to be not
defined which resulted in a compile error at this time. Consequently I have
replaced all occurances of __hpux__ with __hpux. And huge surprise: now osg
plugins are found and loaded correctly ...
The next notable one is the MSVC_IDE fix which makes the nmake Makefiles cmake
generator target behave like the ide one. Showed up because I started to do
scripted builds with nmake instead of devenv...
The rest is the usual bunch of stuff that just happens during normal
coding ..."
This commit is contained in:
Robert Osfield
2009-11-18 12:15:29 +00:00
parent 259daac9a9
commit b7cabac990
13 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgDB/Registry.cpp
View File

@@ -718,14 +718,11 @@ std::string Registry::createLibraryNameForExtension(const std::string& ext)
#else
return prepend+"osgdb_"+lowercase_ext;
#endif
#elif defined(__hpux__)
// why don't we use PLUGIN_EXT from the makefiles here?
return prepend+"osgdb_"+lowercase_ext+".sl";
#else
#ifdef _DEBUG
return prepend+"osgdb_"+lowercase_ext+ OSG_DEBUG_POSTFIX_WITH_QUOTES + ".so";
return prepend+"osgdb_"+lowercase_ext+ OSG_DEBUG_POSTFIX_WITH_QUOTES + ADDQUOTES(OSG_PLUGIN_EXTENSION);
#else
return prepend+"osgdb_"+lowercase_ext+".so";
return prepend+"osgdb_"+lowercase_ext+ADDQUOTES(OSG_PLUGIN_EXTENSION);
#endif
#endif
@@ -749,14 +746,11 @@ std::string Registry::createLibraryNameForNodeKit(const std::string& name)
#else
return name;
#endif
#elif defined(__hpux__)
// why don't we use PLUGIN_EXT from the makefiles here?
return "lib"+name+".sl";
#else
#ifdef _DEBUG
return "lib"+name+OSG_DEBUG_POSTFIX_WITH_QUOTES +".so";
return "lib"+name+OSG_DEBUG_POSTFIX_WITH_QUOTES + ADDQUOTES(OSG_PLUGIN_EXTENSION);
#else
return "lib"+name+".so";
return "lib"+name+ADDQUOTES(OSG_PLUGIN_EXTENSION);
#endif
#endif
}