flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the workaround to install libstdc++-6.dll

Browse Source 
Summary: In version 5.9.0, Qt fixed installing file names containing the plus sign.

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Differential Revision: https://dev.swift-project.org/D45
This commit is contained in:
Roland Winklmeier
2017-07-21 11:12:46 +02:00
committed by Mathew Sutcliffe
parent 07ad4e6656
commit c8a9f76a32
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install.pri
View File

@@ -224,6 +224,7 @@ win32-g++ {
VC_RUNTIME_LIBS *= libgcc_s_seh-1 VC_RUNTIME_LIBS *= libgcc_s_seh-1
} }
VC_RUNTIME_LIBS *= libwinpthread-1 VC_RUNTIME_LIBS *= libwinpthread-1
VC_RUNTIME_LIBS *= libstdc++-6
vc_runtime_target.path *= $${PREFIX}/bin vc_runtime_target.path *= $${PREFIX}/bin
@@ -232,14 +233,6 @@ win32-g++ {
} }
INSTALLS += vc_runtime_target INSTALLS += vc_runtime_target
# libstdc++-6.dll needs a workaround since copy does not accept a filepath with '+' in it
vc_runtime_target.depends += copy_libstdc
copy_libstdc.target = copy_libstdc
source_path = $$[QT_INSTALL_BINS]/libstdc++-6.dll
dest_path = $$vc_runtime_target.path
copy_libstdc.commands = xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path)
QMAKE_EXTRA_TARGETS += copy_libstdc
} }
############### Install externals ############## ############### Install externals ##############

9
src/xswiftbus/xswiftbus.pro
View File

@@ -188,14 +188,7 @@ win32-g++ {
dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_seh-1.dll dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_seh-1.dll
} }
dep_target.files *= $$[QT_INSTALL_BINS]/libwinpthread-1.dll dep_target.files *= $$[QT_INSTALL_BINS]/libwinpthread-1.dll
dep_target.files *= $$[QT_INSTALL_BINS]/libstdc++-6.dll
# libstdc++-6.dll needs a workaround since copy does not accept a filepath with '+' in it
dep_target.depends += copy_libstdc
copy_libstdc.target = copy_libstdc
source_path = $$[QT_INSTALL_BINS]/libstdc++-6.dll
dest_path = $$PREFIX/$$XSWIFTBUS_DIR
copy_libstdc.commands = xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path)
QMAKE_EXTRA_TARGETS += copy_libstdc
} }
INSTALLS += dep_target INSTALLS += dep_target