Use libusb compiled with MSVC 2015

QDB has to change to using Windows 10 for releases, because Windows 8.1
is no longer available for non-qt5 builds as a packaging platform in 5.9
branch.

Don't provision libusb on earlier Windows versions, since they don't
have a compatible compiler.

Change-Id: I771a24fcf208c4961483a39e51cb7d95f004ed55
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
This commit is contained in:
Kari Oikarinen
2017-08-17 12:20:39 +03:00
committed by Simon Hausmann
parent 79db6fc856
commit c2493f9d6d
4 changed files with 3 additions and 6 deletions

View File

@@ -35,11 +35,11 @@
. "$PSScriptRoot\helpers.ps1"
$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196.7z"
$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z"
$libusb_location = "C:\Utils\libusb-1.0"
Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196.7z $archive
Verify-Checksum $archive "160892df83742639da32acc8dabd4f95a4f448e1"
Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
Verify-Checksum $archive "396a3224c306480f24a583850d923d06aa4377c1"
Extract-7Zip $archive $libusb_location

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\libusb.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\libusb.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\libusb.ps1"