From 745e09ddb8e370760f928bc4cb6922329a10f775 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 27 Nov 2016 17:35:30 +0100 Subject: [PATCH] Support installing of mingw 64bit products --- install.pri | 7 ++++++- src/xbus/xbus.pro | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/install.pri b/install.pri index 49f770ce9..a9d5f423e 100644 --- a/install.pri +++ b/install.pri @@ -207,7 +207,12 @@ win32-msvc2015 { } win32-g++ { - VC_RUNTIME_LIBS *= libgcc_s_dw2-1 + equals(WORD_SIZE,32) { + VC_RUNTIME_LIBS *= libgcc_s_dw2-1 + } + equals(WORD_SIZE,64) { + VC_RUNTIME_LIBS *= libgcc_s_seh-1 + } VC_RUNTIME_LIBS *= libwinpthread-1 vc_runtime_target.path *= $${PREFIX}/bin diff --git a/src/xbus/xbus.pro b/src/xbus/xbus.pro index 8ec25cc67..522550efd 100644 --- a/src/xbus/xbus.pro +++ b/src/xbus/xbus.pro @@ -169,7 +169,12 @@ win32 { } win32-g++ { - dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll + equals(WORD_SIZE,32) { + dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll + } + equals(WORD_SIZE,64) { + dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_seh-1.dll + } dep_target.files *= $$[QT_INSTALL_BINS]/libwinpthread-1.dll # libstdc++-6.dll needs a workaround since copy does not accept a filepath with '+' in it