From 56fec3d72a602595580cad4c31c6abf5f9b929ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Tue, 24 Jan 2017 18:25:18 +0100
Subject: [PATCH] Switch to the usbdk backend for libusb on Windows

The usbdk backend is the only libusb backend that has official support
for isochronous transfers (which are required for Wii Speak,
microphones and cameras). And it's actively developed and maintained.
---
 Externals/libusb/libusb_static_2013.vcxproj            | 4 ++--
 Externals/libusb/msvc/libusb_usbdk_static_2015.vcxproj | 2 +-
 Source/VSProps/Base.props                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb_static_2013.vcxproj
index 2aac3e8db1..74397eb70d 100644
--- a/Externals/libusb/libusb_static_2013.vcxproj
+++ b/Externals/libusb/libusb_static_2013.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile Include="libusb\sync.c" />
     <ClCompile Include="libusb\os\threads_windows.c" />
     <ClCompile Include="libusb\os\windows_nt_common.c" />
-    <ClCompile Include="libusb\os\windows_winusb.c" />
+    <ClCompile Include="libusb\os\windows_usbdk.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="msvc\config.h" />
@@ -65,7 +65,7 @@
     <ClInclude Include="libusb\version_nano.h" />
     <ClInclude Include="libusb\os\windows_common.h" />
     <ClInclude Include="libusb\os\windows_nt_common.h" />
-    <ClInclude Include="libusb\os\windows_winusb.h" />
+    <ClInclude Include="libusb\os\windows_usbdk.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Externals/libusb/msvc/libusb_usbdk_static_2015.vcxproj b/Externals/libusb/msvc/libusb_usbdk_static_2015.vcxproj
index 67944bafb7..b02ad158f6 100644
--- a/Externals/libusb/msvc/libusb_usbdk_static_2015.vcxproj
+++ b/Externals/libusb/msvc/libusb_usbdk_static_2015.vcxproj
@@ -159,4 +159,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 0dbbdd59ff..768d03214b 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -51,7 +51,7 @@
       <AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions>USE_UPNP;__LIBUSB__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_UPNP;USE_USBDK;__LIBUSB__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>PSAPI_VERSION=1;_M_X86=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>SFML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>