Changeset 10295

Timestamp:

Mar 1, 2015, 9:59:53 PM (9 years ago)

Author:

muemart

Message:

Avoid using the system path variables on windows (also gets rid of two MSVC warnings)
The altered search path already includes the dll's directory, but it didn't work with forward slashes

Location:

code/trunk/src/libraries/core

Files:

• DynLib.cc (modified) (1 diff)
• GraphicsManager.cc (modified) (1 diff)
• PathConfig.cc (modified) (1 diff)

code/trunk/src/libraries/core/DynLib.cc

@@ -56 +56 @@
     {
         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;
     }

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -267 +267 @@
 #  endif
         }
-#endif
-
-#ifdef ORXONOX_PLATFORM_WINDOWS
-        // Add OGRE plugin path to the environment. That way one plugin could
-        // also depend on another without problems on Windows
-        const char* currentPATH = getenv("PATH");
-        std::string newPATH = pluginPath;
-        if (currentPATH != NULL)
-            newPATH = std::string(currentPATH) + ';' + newPATH;
-        putenv(const_cast<char*>(("PATH=" + newPATH).c_str()));
 #endif
 

code/trunk/src/libraries/core/PathConfig.cc

@@ -260 +260 @@
         size_t moduleextensionlength = moduleextension.size();
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
-        // Add that path to the PATH variable in case a module depends on another one
-        const char* currentPATH = getenv("PATH");
-        std::string newPATH = modulePath_.BF_NATIVE_STRING();
-        if (currentPATH != NULL)
-            newPATH = std::string(currentPATH) + ';' + newPATH;
-        putenv(const_cast<char*>(("PATH=" + newPATH).c_str()));
-#endif
-
         // Make sure the path exists, otherwise don't load modules
         if (!boost::filesystem::exists(modulePath_))