diff options
| author | TheBloke <devnull@localhost> | 2014-07-07 21:39:27 +0100 |
|---|---|---|
| committer | TheBloke <devnull@localhost> | 2014-07-07 21:39:27 +0100 |
| commit | 2a16cc4262bae2f37c1f04d0ee219add64f5642e (patch) | |
| tree | 25e4030ed507774f9a1b9e3e77ef1a32cd715ed8 /src/ModOrganizer.pro | |
| parent | af8973312188c3d90b8e3f8e2f8036d35e3f21ea (diff) | |
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.
Diffstat (limited to 'src/ModOrganizer.pro')
| -rw-r--r-- | src/ModOrganizer.pro | 28 |
1 files changed, 26 insertions, 2 deletions
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
|
