Changeset 8271 for code/branches

Timestamp:

Apr 20, 2011, 12:10:36 AM (14 years ago)

Author:

rgrieder

Message:

Fixed PATH fiddling for module/plugin loading.

Location:

code/branches/kicklib/src/libraries/core

Files:

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

code/branches/kicklib/src/libraries/core/GraphicsManager.cc

@@ -247 +247 @@
 #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
-        std::string pathVariable(getenv("PATH"));
-        putenv(const_cast<char*>(("PATH=" + pathVariable + ';' + pluginPath).c_str()));
+        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
 
         // Do some SubString magic to get the comma separated list of plugins

code/branches/kicklib/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
-        std::string pathVariable(getenv("PATH"));
-        putenv(const_cast<char*>(("PATH=" + pathVariable + ';' + modulePath_.BF_NATIVE_STRING()).c_str()));
+        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

code/branches/kicklib/src/libraries/core/PathConfig.h

@@ -113 +113 @@
             static std::string getModulePathString();
 
-            //! Return trrue for runs in the build directory (not installed)
+            //! Return true for runs in the build directory (not installed)
             static bool isDevelopmentRun() { return getInstance().bDevRun_; }