From a82b7e99495a2a351a1e4a95381ca29225eb8424 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Thu, 13 Mar 2014 19:00:32 +0100
Subject: - "CreateDirectory" will no longer create directories in original
 data directory - bain installer will now be less picky about the archives
 supported - updated NCC to be compatible with more recent NMM code base -
 hack in NCC to allow it to install arbitrary sized files even in 32-bit
 builds - updated the python27.dll to one that links to msvcr100.dll to get
 rid of the dependency of msvcr90.dll - bugfix: dll search order wasn't set to
 allow plugins to load the correct qt dlls

---
 src/mainwindow.cpp |  3 +++
 src/organizer.pro  | 20 ++++++++++----------
 src/version.rc     |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4c66ccce..a39a497e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -322,6 +322,9 @@ MainWindow::MainWindow(const QString &exeName, QSettings &initSettings, QWidget
 
   m_Tutorial.expose("modList", &m_ModList);
   m_Tutorial.expose("espList", &m_PluginList);
+
+  // before we start loading plugins we, add the dll path to the dll search order
+  ::SetDllDirectoryW(ToWString(QDir::toNativeSeparators(qApp->applicationDirPath() + "/dlls")).c_str());
   loadPlugins();
 }
 
diff --git a/src/organizer.pro b/src/organizer.pro
index 9a9d0da3..29cf0434 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -7,7 +7,7 @@
 contains(QT_VERSION, "^5.*") {
   QT       += core gui widgets network declarative script xml sql xmlpatterns
 } else {
-	QT       += core gui network xml declarative script sql xmlpatterns opengl
+  QT       += core gui network xml declarative script sql xmlpatterns
 }
 
 TARGET = ModOrganizer
@@ -95,7 +95,7 @@ HEADERS  += \
     settingsdialog.h \
     settings.h \
     selfupdater.h \
-		selectiondialog.h \
+    selectiondialog.h \
     savegameinfowidgetgamebryo.h \
     savegameinfowidget.h \
     savegamegamebyro.h \
@@ -166,7 +166,7 @@ FORMS    += \
     syncoverwritedialog.ui \
     simpleinstalldialog.ui \
     settingsdialog.ui \
-		selectiondialog.ui \
+    selectiondialog.ui \
     savegameinfowidget.ui \
     queryoverwritedialog.ui \
     profilesdialog.ui \
@@ -197,22 +197,22 @@ INCLUDEPATH += ../shared ../archive ../uibase ../bsatk ../esptk ../boss_modified
 LIBS += -L"$(BOOSTPATH)/stage/lib"
 
 CONFIG(debug, debug|release) {
-	OUTDIR = $$OUT_PWD/debug
-	DSTDIR = $$PWD/../../outputd
+  OUTDIR = $$OUT_PWD/debug
+  DSTDIR = $$PWD/../../outputd
   LIBS += -L$$OUT_PWD/../shared/debug
   LIBS += -L$$OUT_PWD/../bsatk/debug
   LIBS += -L$$OUT_PWD/../uibase/debug
   LIBS += -L$$OUT_PWD/../boss_modified/debug
   LIBS += -lDbgHelp
 } else {
-	OUTDIR = $$OUT_PWD/release
-	DSTDIR = $$PWD/../../output
+  OUTDIR = $$OUT_PWD/release
+  DSTDIR = $$PWD/../../output
   LIBS += -L$$OUT_PWD/../shared/release
   LIBS += -L$$OUT_PWD/../bsatk/release
 	LIBS += -L$$OUT_PWD/../uibase/release
   LIBS += -L$$OUT_PWD/../boss_modified/release
   QMAKE_CXXFLAGS += /Zi /GL
-#	QMAKE_CXXFLAGS -= -O2
+#  QMAKE_CXXFLAGS -= -O2
   QMAKE_LFLAGS += /DEBUG /LTCG /OPT:REF /OPT:ICF
 }
 
@@ -283,7 +283,7 @@ CONFIG(debug, debug|release) {
 }
 
 RESOURCES += \
-		resources.qrc \
+    resources.qrc \
     stylesheet_resource.qrc
 
 RC_FILE += \
@@ -303,7 +303,7 @@ OTHER_FILES += \
     tutorials/tutorials_modinfodialog.qml \
     tutorials/tutorial_firststeps_modinfo.js \
     tutorials/tutorial_conflictresolution_main.js \
-		tutorials/tutorial_conflictresolution_modinfo.js \
+    tutorials/tutorial_conflictresolution_modinfo.js \
     app_icon.rc \
     dark.qss \
     stylesheets/dark.qss \
diff --git a/src/version.rc b/src/version.rc
index 426e927e..33c25b1c 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -1,7 +1,7 @@
 #include "Winver.h"
 
-#define VER_FILEVERSION     1,1,2,0
-#define VER_FILEVERSION_STR "1,1,2,0\0"
+#define VER_FILEVERSION     1,1,3,0
+#define VER_FILEVERSION_STR "1,1,3,0\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
-- 
cgit v1.3.1