Changeset 10150 for OpenSceneGraph/trunk/src/osgDB/Registry.cpp

Timestamp:

05/07/09 15:23:35 (4 years ago)

Author:

robert

Message:

From Stephan Huber, "while debugging a problem in finding plugins on OS X I discovered, that
the conditional directives for setting the prepend-string in
createLibraryNameForExtension were not in effect, because of the mixture
of different #ifdef styles.

I removed the conditional part for APPLE completely to be more
standard-conform with other platforms (plugins should be located in
osgPlugins-X.X.X/). Because of the wrong syntax of the conditional
compile the old code was not used anyway -- so no functional change.
"

Files:

• OpenSceneGraph/trunk/src/osgDB/Registry.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgDB/Registry.cpp

@@ -675 +675 @@
     if (itr!=_extAliasMap.end() && ext != itr->second) return createLibraryNameForExtension(itr->second);
 
-#ifdef OSG_JAVA_BUILD
+#if defined(OSG_JAVA_BUILD)
     static std::string prepend = std::string("osgPlugins-")+std::string(osgGetVersion())+std::string("/java");
-#elseif defined(__APPLE__)
-    // OSX is rather a mess in FileUtils.cpp w.r.t its appendPlatformSpecificLibraryFilePaths implementation
-    // as it hardwires the plugin name to PlugIns.  This *needs* fixing to use the naming convention as all
-    // other platforms.
-    static std::string prepend = "";
 #else
     static std::string prepend = std::string("osgPlugins-")+std::string(osgGetVersion())+std::string("/");