Merge

1 files changed, 19 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 268bb98f..ab740467 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,6 +64,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDesktopServices>
 #include <eh.h>
 #include <windows_error.h>
+#include <boost/scoped_array.hpp>
 
 #pragma comment(linker, "/manifestDependency:\"name='dlls' processorArchitecture='x86' version='1.0.0.0' type='win32' \"")
 
@@ -284,6 +285,24 @@ int main(int argc, char *argv[])
   QSplashScreen splash(pixmap);
   splash.show();
 
+  { // extend path to include dll directory so plugins don't need a manifest
+    static const int BUFSIZE = 4096;
+
+    boost::scoped_array<TCHAR> oldPath(new TCHAR[BUFSIZE]);
+    DWORD offset = ::GetEnvironmentVariable(TEXT("PATH"), oldPath.get(), BUFSIZE);
+    if (offset > BUFSIZE) {
+      oldPath.reset(new TCHAR[offset]);
+      ::GetEnvironmentVariable(TEXT("PATH"), oldPath.get(), offset);
+    }
+
+    std::tstring newPath(oldPath.get());
+    newPath += TEXT(";");
+    newPath += ToWString(QDir::toNativeSeparators(QCoreApplication::applicationDirPath())).c_str();
+    newPath += TEXT("\\dlls");
+
+    ::SetEnvironmentVariable(TEXT("PATH"), newPath.c_str());
+  }
+
   registerMetaTypes();
 
   QStringList arguments = application.arguments();