From 46a32ff3b7bcf6bd4ccc9470c7712a4bbd429a48 Mon Sep 17 00:00:00 2001 From: TheBloke 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') 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