From 62b0c07a93bbf244dbf8ae4bc73f008cfa1fc84d Mon Sep 17 00:00:00 2001
From: TheBloke <devnull@localhost>
Date: Mon, 7 Jul 2014 21:39:27 +0100
Subject: Added 'make install' steps in ModOrganizer.pro -  Added config to
 install required libraries to output(d) directory  If the user adds a Deploy
 step, that runs 'jom install', he will have the   necessary libraries copied
 to output(d)\dlls  These libraries are -   7z.dll   Qt4 Core Declarative Gui
 Network OpenGL Script Sql Svg Webkit Xml XmlPatterns    Different set
 configured for Qt5, e.g. adding Widgets, Qml, Quick    In a debug build, the
 'd' DLLs will be used instead.    Qt4 libraries are copied from system Qt4
 installation directory.  This allows the Qt-Creator user to hit "Run" in Qt-C
 and end up with a complete   install, including all DLLs; no manual Exporer
 copying required.  This therefore removes the need for post-build steps 10 &
 11 in Readme.txt.  Future thought - Update all current POST_LINK (x)copy
 steps to make install?

Fixed DESTDIR in ModOrganizer.pro
 It was pointing to source/output(d) before, should be ..\output(d)
 It was not used before so didn't matter, but is now referenced for install.
---
 src/ModOrganizer.pro | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'src/ModOrganizer.pro')

diff --git a/src/ModOrganizer.pro b/src/ModOrganizer.pro
index 4624ffec..b345d64b 100644
--- a/src/ModOrganizer.pro
+++ b/src/ModOrganizer.pro
@@ -21,7 +21,31 @@ hookdll.depends = shared
 organizer.depends = shared uibase plugins loot_cli
 
 CONFIG(debug, debug|release) {
-    DESTDIR = outputd
+  DESTDIR = $$PWD/../outputd
 } else {
-    DESTDIR = output
+  DESTDIR = $$PWD/../output
 }
+
+STATICDATAPATH = $${DESTDIR}\\..\\tools\\static_data\\dlls
+DLLSPATH = $${DESTDIR}\\dlls
+
+otherlibs.path = $$DLLSPATH
+otherlibs.files += $${STATICDATAPATH}\\7z.dll
+
+qtlibs.path = $$DLLSPATH
+
+equals(QT_MAJOR_VERSION, 5) {
+  QTLIBNAMES += Core Gui Network OpenGL Script Sql Svg Qml Quick Webkit Widgets Xml XmlPatterns
+} else {
+  QTLIBNAMES += Core Declarative Gui Network OpenGL Script Sql Svg Webkit Xml XmlPatterns
+}
+
+QTLIBSUFFIX = $${QT_MAJOR_VERSION}.dll
+CONFIG(debug, debug|release): QTLIBSUFFIX = "d$${QTLIBSUFFIX}" # Can't use Debug: .. here, it ignores the line - no idea why, as it works in BossDummy.pro
+
+for(QTNAME, QTLIBNAMES) {
+  QTFILE = Qt$${QTNAME}
+  qtlibs.files += $$[QT_INSTALL_BINS]\\$${QTFILE}$${QTLIBSUFFIX}
+}
+
+INSTALLS += qtlibs otherlibs
-- 
cgit v1.3.1


From 46a32ff3b7bcf6bd4ccc9470c7712a4bbd429a48 Mon Sep 17 00:00:00 2001
From: TheBloke <devnull@localhost>
Date: Tue, 8 Jul 2014 04:05:33 +0100
Subject: Additional 'make install' step - install boost_python DLL to
 output(d)\DLLs  Extended the new ModOrganizer.pro 'make install' steps, to
 now also copy   $$(BOOSTPATH)\stage\lib\boost_python-vc*-mt-1*.dll  This is
 the final install step required, so that now ModOrganizer.exe works   fully
 when a Qt-Creator "Run" step is performed.  The wildcard should pick up the
 right version of the library regardless of   MSVC compiler version used.

Updated Qt5 version check to the standardised greaterThan check.
---
 src/ModOrganizer.pro | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/ModOrganizer.pro')

diff --git a/src/ModOrganizer.pro b/src/ModOrganizer.pro
index b345d64b..859f4caf 100644
--- a/src/ModOrganizer.pro
+++ b/src/ModOrganizer.pro
@@ -30,11 +30,12 @@ STATICDATAPATH = $${DESTDIR}\\..\\tools\\static_data\\dlls
 DLLSPATH = $${DESTDIR}\\dlls
 
 otherlibs.path = $$DLLSPATH
-otherlibs.files += $${STATICDATAPATH}\\7z.dll
+otherlibs.files += $${STATICDATAPATH}\\7z.dll \
+    $$(BOOSTPATH)\\stage\\lib\\boost_python-vc*-mt-1*.dll
 
 qtlibs.path = $$DLLSPATH
 
-equals(QT_MAJOR_VERSION, 5) {
+greaterThan(QT_MAJOR_VERSION, 4) {
   QTLIBNAMES += Core Gui Network OpenGL Script Sql Svg Qml Quick Webkit Widgets Xml XmlPatterns
 } else {
   QTLIBNAMES += Core Declarative Gui Network OpenGL Script Sql Svg Webkit Xml XmlPatterns
-- 
cgit v1.3.1