[Orxonox-commit 3587] r8272 - code/branches/kicklib/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-20 00:29:08 +0200 (Wed, 20 Apr 2011)
New Revision: 8272

Modified:
   code/branches/kicklib/src/libraries/core/GraphicsManager.cc
   code/branches/kicklib/src/libraries/core/PathConfig.cc
Log:
Load Ogre plugins and Orxonox modules with the same path composition.
This should load Ogre plugins again on Linux.

Modified: code/branches/kicklib/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/kicklib/src/libraries/core/GraphicsManager.cc	2011-04-19 22:10:36 UTC (rev 8271)
+++ code/branches/kicklib/src/libraries/core/GraphicsManager.cc	2011-04-19 22:29:08 UTC (rev 8272)
@@ -259,7 +259,7 @@
         // Do some SubString magic to get the comma separated list of plugins
         SubString plugins(ogrePlugins_, ",", " ", false, '\\', false, '"', false, '{', '}', false, '\0');
         for (unsigned int i = 0; i < plugins.size(); ++i)
-            ogreRoot_->loadPlugin(plugins[i]);
+            ogreRoot_->loadPlugin(pluginPath + '/' + plugins[i]);
     }
 
     void GraphicsManager::loadRenderer()

Modified: code/branches/kicklib/src/libraries/core/PathConfig.cc
===================================================================
--- code/branches/kicklib/src/libraries/core/PathConfig.cc	2011-04-19 22:10:36 UTC (rev 8271)
+++ code/branches/kicklib/src/libraries/core/PathConfig.cc	2011-04-19 22:29:08 UTC (rev 8272)
@@ -287,7 +287,7 @@
                 {
                     // We've found a helper file
                     const std::string& library = filename.substr(0, filename.size() - moduleextensionlength);
-                    modulePaths.push_back((modulePath_ / library).BF_NATIVE_STRING());
+                    modulePaths.push_back(getModulePathString() + library);
                 }
             }
             ++file;