Skip to content

Commit 3c866c4

Browse files
Merge remote-tracking branch 'libusb/master'
2 parents bc48e17 + dcd30ce commit 3c866c4

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎libusb/os/emscripten_webusb.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ int em_get_config_descriptor_by_value(libusb_device* dev,
706706
}
707707

708708
int em_set_configuration(libusb_device_handle* dev_handle, int config) {
709-
return WebUsbDevicePtr(dev_handle)->awaitOnMain("setConfiguration", config);
709+
return WebUsbDevicePtr(dev_handle)->awaitOnMain("selectConfiguration", config);
710710
}
711711

712712
int em_claim_interface(libusb_device_handle* handle, uint8_t iface) {

‎libusb/version_nano.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define LIBUSB_NANO 11993
1+
#define LIBUSB_NANO 11995

‎msvc/build_all.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$toolsets = "v120", "v140", "v141", "v142", "v143"
1+
$toolsets = "v120", "v140", "v141", "v142", "v143", "v145"
22
$platforms = "Win32", "x64", "ARM", "ARM64"
33
$configurations = "Debug", "Release"
44

@@ -14,4 +14,4 @@ foreach ($toolset in $toolsets) {
1414
msbuild -m -v:m -p:PlatformToolset=$toolset,Platform=$plat,Configuration=$conf $PSScriptRoot\libusb.sln
1515
}
1616
}
17-
}
17+
}

0 commit comments

Comments
 (0)