diff options
| author | TheBloke <devnull@localhost> | 2014-07-08 04:05:33 +0100 |
|---|---|---|
| committer | TheBloke <devnull@localhost> | 2014-07-08 04:05:33 +0100 |
| commit | 3d98491ebc84619b02286d823199c5b608fa7569 (patch) | |
| tree | 865d2ca2e5fe16168116a1a31d025762bd2a4ef5 /src | |
| parent | 923654961b168cfa287483b07b9745ba6cec3875 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ModOrganizer.pro | 5 |
1 files changed, 3 insertions, 2 deletions
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
|