Win32: Deploy plugins to "bin/plugins"

Keeping the plugins separate makes the bin folder cleaner and helps the engine find the correct shared libraries.
skyjake · Oct 15, 2012 · cf07bf3 · cf07bf3
1 parent 5d4d800
commit cf07bf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doomsday/config_win32.pri b/doomsday/config_win32.pri
@@ -20,7 +20,7 @@ DENG_EXPORT_LIB = $$OUT_PWD/../engine/doomsday.lib
 DENG_BASE_DIR       = $$DENG_WIN_PRODUCTS_DIR
 DENG_BIN_DIR        = $$DENG_BASE_DIR/bin
 DENG_LIB_DIR        = $$DENG_BIN_DIR
-DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR
+DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/plugins
 DENG_DATA_DIR       = $$DENG_BASE_DIR/data
 DENG_DOCS_DIR       = $$DENG_BASE_DIR/doc
 

diff --git a/doomsday/libdeng2/src/core/app.cpp b/doomsday/libdeng2/src/core/app.cpp
@@ -59,7 +59,7 @@ String App::nativeBinaryPath()
 {
     String path;
 #ifdef WIN32
-    path = _appPath.fileNameNativePath();
+    path = _appPath.fileNameNativePath() / "plugins";
 #else
 # ifdef MACOSX
     path = _appPath.fileNameNativePath() / "../DengPlugins";
@@ -111,8 +111,8 @@ void App::initSubsystems()
     //fs_->makeFolder("/modules").attach(new DirectoryFeed("Resources/modules"));
 
 #elif WIN32
+    _fs.makeFolder("/bin").attach(new DirectoryFeed(nativeBinaryPath()));
     String appDir = _appPath.fileNameNativePath();
-    _fs.makeFolder("/bin").attach(new DirectoryFeed(appDir.concatenateNativePath("..\\bin")));
     _fs.makeFolder("/data").attach(new DirectoryFeed(appDir.concatenateNativePath("..\\data")));
     _fs.makeFolder("/config").attach(new DirectoryFeed(appDir.concatenateNativePath("..\\data\\config")));
     //fs_->makeFolder("/modules").attach(new DirectoryFeed("data\\modules"));