[Orxonox-commit 5863] r10523 - code/branches/core7/src/libraries/core

[landauf at orxonox.net]

Author: landauf
Date: 2015-05-31 14:46:32 +0200 (Sun, 31 May 2015)
New Revision: 10523

Modified:
   code/branches/core7/src/libraries/core/DynLib.cc
Log:
bugfix: DynLib::mName must be equal to the string in the DynLibManager::mLibList map, otherwise DynLibManager isn't able to find an existing libs in this map.

Modified: code/branches/core7/src/libraries/core/DynLib.cc
===================================================================
--- code/branches/core7/src/libraries/core/DynLib.cc	2015-05-31 12:24:07 UTC (rev 10522)
+++ code/branches/core7/src/libraries/core/DynLib.cc	2015-05-31 12:46:32 UTC (rev 10523)
@@ -55,10 +55,6 @@
     DynLib::DynLib( const std::string& name )
     {
         mName = name;
-#if defined(ORXONOX_PLATFORM_WINDOWS)
-        //altered search path doesn't work with paths with forward slashes
-        std::replace(mName.begin(), mName.end(), '/', '\\');
-#endif
         m_hInst = NULL;
     }
 
@@ -83,6 +79,8 @@
         if (name.substr(name.length() - 6, 6) != ".dylib")
             name += ".dylib";
 #elif defined(ORXONOX_PLATFORM_WINDOWS)
+        //altered search path doesn't work with paths with forward slashes
+        std::replace(name.begin(), name.end(), '/', '\\');
         // Although LoadLibraryEx will add .dll itself when you only specify the library name,
         // if you include a relative path then it does not. So, add it to be sure.
         if (name.substr(name.length() - 4, 4) != ".dll")