usb 2.0.0-alpha.2 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (258) hide show
  1. package/.gitmodules +1 -1
  2. package/CHANGELOG.md +100 -0
  3. package/README.md +573 -0
  4. package/binding.gyp +12 -2
  5. package/dist/index.d.ts +4 -4
  6. package/dist/index.js +14 -8
  7. package/dist/index.js.map +1 -1
  8. package/dist/usb/bindings.d.ts +13 -0
  9. package/dist/usb/bindings.js +2 -1
  10. package/dist/usb/bindings.js.map +1 -1
  11. package/dist/usb/index.js +86 -2
  12. package/dist/usb/index.js.map +1 -1
  13. package/dist/usb/interface.js.map +1 -1
  14. package/dist/webusb/index.d.ts +32 -19
  15. package/dist/webusb/index.js +163 -67
  16. package/dist/webusb/index.js.map +1 -1
  17. package/dist/webusb/webusb-device.d.ts +1 -1
  18. package/dist/webusb/webusb-device.js +27 -15
  19. package/dist/webusb/webusb-device.js.map +1 -1
  20. package/libusb/.private/pre-commit.sh +7 -1
  21. package/libusb/.travis.yml +49 -0
  22. package/libusb/AUTHORS +44 -3
  23. package/libusb/Brewfile +4 -0
  24. package/libusb/ChangeLog +74 -2
  25. package/libusb/README.md +32 -0
  26. package/libusb/TODO +1 -1
  27. package/libusb/Xcode/common.xcconfig +12 -0
  28. package/libusb/Xcode/config.h +25 -0
  29. package/libusb/Xcode/libusb.xcodeproj/project.pbxproj +959 -1
  30. package/libusb/android/README +4 -2
  31. package/libusb/android/config.h +75 -0
  32. package/libusb/appveyor.yml +41 -0
  33. package/libusb/appveyor_cygwin.bat +11 -0
  34. package/libusb/appveyor_minGW.bat +19 -0
  35. package/libusb/autogen.sh +1 -1
  36. package/libusb/bootstrap.sh +3 -16
  37. package/libusb/configure.ac +108 -80
  38. package/libusb/doc/doxygen.cfg.in +1785 -739
  39. package/libusb/examples/Makefile.am +1 -1
  40. package/libusb/examples/dpfp.c +3 -1
  41. package/libusb/examples/dpfp_threaded.c +23 -10
  42. package/libusb/examples/ezusb.c +3 -3
  43. package/libusb/examples/ezusb.h +2 -2
  44. package/libusb/examples/fxload.c +31 -9
  45. package/libusb/examples/hotplugtest.c +35 -7
  46. package/libusb/examples/listdevs.c +3 -1
  47. package/libusb/examples/sam3u_benchmark.c +3 -3
  48. package/libusb/examples/testlibusb.c +277 -0
  49. package/libusb/examples/xusb.c +40 -34
  50. package/libusb/libusb/Makefile.am +49 -23
  51. package/libusb/libusb/core.c +855 -457
  52. package/libusb/libusb/descriptor.c +72 -78
  53. package/libusb/libusb/hotplug.c +122 -76
  54. package/libusb/libusb/hotplug.h +42 -25
  55. package/libusb/libusb/io.c +625 -390
  56. package/libusb/libusb/libusb-1.0.def +12 -0
  57. package/libusb/libusb/libusb.h +218 -150
  58. package/libusb/libusb/libusbi.h +346 -176
  59. package/libusb/libusb/os/darwin_usb.c +604 -319
  60. package/libusb/libusb/os/darwin_usb.h +61 -20
  61. package/libusb/libusb/os/haiku_pollfs.cpp +367 -0
  62. package/libusb/libusb/os/haiku_usb.h +113 -0
  63. package/libusb/libusb/os/haiku_usb_backend.cpp +533 -0
  64. package/libusb/libusb/os/haiku_usb_raw.cpp +267 -0
  65. package/libusb/libusb/os/haiku_usb_raw.h +188 -0
  66. package/libusb/libusb/os/linux_netlink.c +186 -146
  67. package/libusb/libusb/os/linux_udev.c +36 -14
  68. package/libusb/libusb/os/linux_usbfs.c +426 -225
  69. package/libusb/libusb/os/linux_usbfs.h +5 -3
  70. package/libusb/libusb/os/netbsd_usb.c +21 -77
  71. package/libusb/libusb/os/openbsd_usb.c +32 -115
  72. package/libusb/libusb/os/poll_posix.c +38 -5
  73. package/libusb/libusb/os/poll_posix.h +3 -0
  74. package/libusb/libusb/os/poll_windows.c +277 -626
  75. package/libusb/libusb/os/poll_windows.h +11 -44
  76. package/libusb/libusb/os/sunos_usb.c +1695 -0
  77. package/libusb/libusb/os/sunos_usb.h +80 -0
  78. package/libusb/libusb/os/threads_posix.c +24 -26
  79. package/libusb/libusb/os/threads_posix.h +73 -21
  80. package/libusb/libusb/os/threads_windows.c +71 -157
  81. package/libusb/libusb/os/threads_windows.h +68 -44
  82. package/libusb/libusb/os/wince_usb.c +276 -420
  83. package/libusb/libusb/os/wince_usb.h +23 -28
  84. package/libusb/libusb/os/windows_common.h +78 -58
  85. package/libusb/libusb/os/windows_nt_common.c +1010 -0
  86. package/libusb/libusb/os/windows_nt_common.h +110 -0
  87. package/libusb/libusb/os/windows_nt_shared_types.h +147 -0
  88. package/libusb/libusb/os/windows_usbdk.c +830 -0
  89. package/libusb/libusb/os/windows_usbdk.h +103 -0
  90. package/libusb/libusb/os/windows_winusb.c +4391 -0
  91. package/libusb/libusb/os/windows_winusb.h +783 -0
  92. package/libusb/libusb/strerror.c +41 -7
  93. package/libusb/libusb/sync.c +41 -13
  94. package/libusb/libusb/version.h +1 -1
  95. package/libusb/libusb/version_nano.h +1 -1
  96. package/libusb/libusb-1.0.pc.in +1 -1
  97. package/libusb/msvc/appveyor.bat +27 -0
  98. package/libusb/msvc/config.h +5 -4
  99. package/libusb/msvc/ddk_build.cmd +87 -43
  100. package/libusb/msvc/fxload_2010.vcxproj +24 -104
  101. package/libusb/msvc/fxload_2012.vcxproj +24 -107
  102. package/libusb/msvc/fxload_2013.vcxproj +24 -107
  103. package/libusb/msvc/fxload_2015.vcxproj +91 -0
  104. package/libusb/msvc/fxload_2017.vcxproj +114 -0
  105. package/libusb/msvc/fxload_sources +1 -1
  106. package/libusb/msvc/getopt_2010.vcxproj +16 -75
  107. package/libusb/msvc/getopt_2012.vcxproj +16 -79
  108. package/libusb/msvc/getopt_2013.vcxproj +16 -79
  109. package/libusb/msvc/getopt_2015.vcxproj +73 -0
  110. package/libusb/msvc/getopt_2017.vcxproj +98 -0
  111. package/libusb/msvc/getopt_sources +6 -2
  112. package/libusb/msvc/hotplugtest_2010.vcxproj +18 -99
  113. package/libusb/msvc/hotplugtest_2012.vcxproj +18 -102
  114. package/libusb/msvc/hotplugtest_2013.vcxproj +18 -102
  115. package/libusb/msvc/hotplugtest_2015.vcxproj +83 -0
  116. package/libusb/msvc/hotplugtest_2017.vcxproj +106 -0
  117. package/libusb/msvc/hotplugtest_sources +1 -1
  118. package/libusb/msvc/libusb_2005.sln +20 -20
  119. package/libusb/msvc/libusb_2010.sln +57 -46
  120. package/libusb/msvc/libusb_2012.sln +57 -46
  121. package/libusb/msvc/libusb_2013.sln +57 -50
  122. package/libusb/msvc/libusb_2015.sln +59 -52
  123. package/libusb/msvc/libusb_2017.sln +186 -0
  124. package/libusb/msvc/libusb_dll.dsp +2 -2
  125. package/libusb/msvc/libusb_dll_2005.vcproj +30 -2
  126. package/libusb/msvc/libusb_dll_2010.vcxproj +26 -90
  127. package/libusb/msvc/libusb_dll_2012.vcxproj +28 -96
  128. package/libusb/msvc/libusb_dll_2013.vcxproj +28 -96
  129. package/libusb/msvc/libusb_dll_2015.vcxproj +107 -0
  130. package/libusb/msvc/libusb_dll_2017.vcxproj +134 -0
  131. package/libusb/msvc/libusb_dll_wince.vcproj +9 -1
  132. package/libusb/msvc/libusb_sources +10 -5
  133. package/libusb/msvc/libusb_static.dsp +2 -2
  134. package/libusb/msvc/libusb_static_2005.vcproj +32 -4
  135. package/libusb/msvc/libusb_static_2010.vcxproj +24 -83
  136. package/libusb/msvc/libusb_static_2012.vcxproj +25 -87
  137. package/libusb/msvc/libusb_static_2013.vcxproj +25 -87
  138. package/libusb/msvc/libusb_static_2015.vcxproj +98 -0
  139. package/libusb/msvc/libusb_static_2017.vcxproj +117 -0
  140. package/libusb/msvc/libusb_static_wince.vcproj +20 -26
  141. package/libusb/msvc/libusb_wince.sln +88 -88
  142. package/libusb/msvc/listdevs_2010.vcxproj +16 -99
  143. package/libusb/msvc/listdevs_2012.vcxproj +16 -102
  144. package/libusb/msvc/listdevs_2013.vcxproj +16 -102
  145. package/libusb/msvc/listdevs_2015.vcxproj +83 -0
  146. package/libusb/msvc/listdevs_2017.vcxproj +106 -0
  147. package/libusb/msvc/listdevs_sources +2 -1
  148. package/libusb/msvc/stress_2010.vcxproj +20 -101
  149. package/libusb/msvc/stress_2012.vcxproj +20 -104
  150. package/libusb/msvc/stress_2013.vcxproj +20 -104
  151. package/libusb/msvc/stress_2015.vcxproj +87 -0
  152. package/libusb/msvc/stress_2017.vcxproj +110 -0
  153. package/libusb/msvc/stress_sources +21 -0
  154. package/libusb/msvc/testlibusb_2010.vcxproj +82 -0
  155. package/libusb/msvc/testlibusb_2012.vcxproj +83 -0
  156. package/libusb/msvc/testlibusb_2013.vcxproj +83 -0
  157. package/libusb/msvc/testlibusb_2015.vcxproj +83 -0
  158. package/libusb/msvc/testlibusb_2017.vcxproj +106 -0
  159. package/libusb/msvc/testlibusb_sources +20 -0
  160. package/libusb/msvc/xusb_2010.vcxproj +17 -98
  161. package/libusb/msvc/xusb_2012.vcxproj +17 -101
  162. package/libusb/msvc/xusb_2013.vcxproj +17 -101
  163. package/libusb/msvc/xusb_2015.vcxproj +83 -0
  164. package/libusb/msvc/xusb_2017.vcxproj +106 -0
  165. package/libusb/msvc/xusb_sources +1 -1
  166. package/libusb/tests/stress.c +2 -2
  167. package/libusb/tests/testlib.c +0 -4
  168. package/libusb/travis-autogen.sh +39 -0
  169. package/libusb.gypi +21 -2
  170. package/package.json +18 -13
  171. package/prebuilds/android-arm/node.napi.node +0 -0
  172. package/prebuilds/android-arm64/node.napi.node +0 -0
  173. package/prebuilds/darwin-x64+arm64/node.napi.node +0 -0
  174. package/prebuilds/linux-arm/node.napi.node +0 -0
  175. package/prebuilds/linux-arm64/node.napi.node +0 -0
  176. package/prebuilds/linux-ia32/node.napi.node +0 -0
  177. package/prebuilds/linux-x64/node.napi.node +0 -0
  178. package/prebuilds/win32-ia32/node.napi.node +0 -0
  179. package/prebuilds/win32-x64/node.napi.node +0 -0
  180. package/src/device.cc +7 -7
  181. package/src/node_usb.cc +43 -1
  182. package/src/node_usb.h +1 -0
  183. package/src/uv_async_queue.h +33 -25
  184. package/test/usb.coffee +6 -0
  185. package/tsc/index.ts +13 -7
  186. package/tsc/usb/bindings.ts +19 -1
  187. package/tsc/usb/index.ts +67 -19
  188. package/tsc/usb/interface.ts +2 -2
  189. package/tsc/webusb/index.ts +197 -74
  190. package/tsc/webusb/webusb-device.ts +30 -17
  191. package/.github/workflows/prebuild.yml +0 -48
  192. package/Readme.md +0 -339
  193. package/dist/webusb/typed-event-target.d.ts +0 -11
  194. package/dist/webusb/typed-event-target.js +0 -21
  195. package/dist/webusb/typed-event-target.js.map +0 -1
  196. package/docs/assets/css/main.css +0 -2660
  197. package/docs/assets/images/icons.png +0 -0
  198. package/docs/assets/images/icons@2x.png +0 -0
  199. package/docs/assets/images/widgets.png +0 -0
  200. package/docs/assets/images/widgets@2x.png +0 -0
  201. package/docs/assets/js/main.js +0 -248
  202. package/docs/assets/js/search.js +0 -1
  203. package/docs/classes/usb_bindings.device.html +0 -1338
  204. package/docs/classes/usb_bindings.libusbexception.html +0 -234
  205. package/docs/classes/usb_bindings.transfer.html +0 -344
  206. package/docs/classes/usb_capability.capability.html +0 -297
  207. package/docs/classes/usb_device.extendeddevice.html +0 -766
  208. package/docs/classes/usb_endpoint.endpoint.html +0 -472
  209. package/docs/classes/usb_endpoint.inendpoint.html +0 -766
  210. package/docs/classes/usb_endpoint.outendpoint.html +0 -582
  211. package/docs/classes/usb_interface.interface.html +0 -648
  212. package/docs/classes/webusb.webusb-1.html +0 -615
  213. package/docs/classes/webusb_mutex.mutex.html +0 -270
  214. package/docs/classes/webusb_typed_event_target.typedeventtarget.html +0 -443
  215. package/docs/classes/webusb_webusb_device.webusbdevice.html +0 -904
  216. package/docs/index.html +0 -500
  217. package/docs/interfaces/usb.deviceevents.html +0 -242
  218. package/docs/interfaces/usb_descriptors.bosdescriptor.html +0 -293
  219. package/docs/interfaces/usb_descriptors.capabilitydescriptor.html +0 -274
  220. package/docs/interfaces/usb_descriptors.configdescriptor.html +0 -388
  221. package/docs/interfaces/usb_descriptors.devicedescriptor.html +0 -464
  222. package/docs/interfaces/usb_descriptors.endpointdescriptor.html +0 -370
  223. package/docs/interfaces/usb_descriptors.interfacedescriptor.html +0 -407
  224. package/docs/interfaces/webusb.usboptions.html +0 -226
  225. package/docs/modules/index.html +0 -304
  226. package/docs/modules/usb.html +0 -173
  227. package/docs/modules/usb_bindings.html +0 -2248
  228. package/docs/modules/usb_capability.html +0 -156
  229. package/docs/modules/usb_descriptors.html +0 -176
  230. package/docs/modules/usb_device.html +0 -156
  231. package/docs/modules/usb_endpoint.html +0 -164
  232. package/docs/modules/usb_interface.html +0 -156
  233. package/docs/modules/webusb.html +0 -165
  234. package/docs/modules/webusb_mutex.html +0 -156
  235. package/docs/modules/webusb_typed_event_target.html +0 -156
  236. package/docs/modules/webusb_webusb_device.html +0 -156
  237. package/docs/modules.html +0 -156
  238. package/libusb/INSTALL +0 -234
  239. package/libusb/README +0 -28
  240. package/libusb/libusb/os/windows_usb.c +0 -5347
  241. package/libusb/libusb/os/windows_usb.h +0 -971
  242. package/libusb/msvc/fxload_2010.vcxproj.filters +0 -25
  243. package/libusb/msvc/fxload_2012.vcxproj.filters +0 -25
  244. package/libusb/msvc/getopt_2010.vcxproj.filters +0 -26
  245. package/libusb/msvc/getopt_2012.vcxproj.filters +0 -26
  246. package/libusb/msvc/hotplugtest_2010.vcxproj.filters +0 -14
  247. package/libusb/msvc/hotplugtest_2012.vcxproj.filters +0 -14
  248. package/libusb/msvc/libusb_dll_2010.vcxproj.filters +0 -81
  249. package/libusb/msvc/libusb_dll_2012.vcxproj.filters +0 -84
  250. package/libusb/msvc/libusb_static_2010.vcxproj.filters +0 -74
  251. package/libusb/msvc/libusb_static_2012.vcxproj.filters +0 -74
  252. package/libusb/msvc/listdevs_2010.vcxproj.filters +0 -14
  253. package/libusb/msvc/listdevs_2012.vcxproj.filters +0 -14
  254. package/libusb/msvc/stress_2010.vcxproj.filters +0 -25
  255. package/libusb/msvc/stress_2012.vcxproj.filters +0 -25
  256. package/libusb/msvc/xusb_2010.vcxproj.filters +0 -14
  257. package/libusb/msvc/xusb_2012.vcxproj.filters +0 -14
  258. package/tsc/webusb/typed-event-target.ts +0 -23
package/libusb/msvc/libusb_dll_2017.vcxproj ADDED
@@ -0,0 +1,134 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+ <ItemGroup Label="ProjectConfigurations">
4
+ <ProjectConfiguration Include="Debug|ARM">
5
+ <Configuration>Debug</Configuration>
6
+ <Platform>ARM</Platform>
7
+ </ProjectConfiguration>
8
+ <ProjectConfiguration Include="Debug|ARM64">
9
+ <Configuration>Debug</Configuration>
10
+ <Platform>ARM64</Platform>
11
+ </ProjectConfiguration>
12
+ <ProjectConfiguration Include="Debug|Win32">
13
+ <Configuration>Debug</Configuration>
14
+ <Platform>Win32</Platform>
15
+ </ProjectConfiguration>
16
+ <ProjectConfiguration Include="Debug|x64">
17
+ <Configuration>Debug</Configuration>
18
+ <Platform>x64</Platform>
19
+ </ProjectConfiguration>
20
+ <ProjectConfiguration Include="Release|ARM">
21
+ <Configuration>Release</Configuration>
22
+ <Platform>ARM</Platform>
23
+ </ProjectConfiguration>
24
+ <ProjectConfiguration Include="Release|ARM64">
25
+ <Configuration>Release</Configuration>
26
+ <Platform>ARM64</Platform>
27
+ </ProjectConfiguration>
28
+ <ProjectConfiguration Include="Release|Win32">
29
+ <Configuration>Release</Configuration>
30
+ <Platform>Win32</Platform>
31
+ </ProjectConfiguration>
32
+ <ProjectConfiguration Include="Release|x64">
33
+ <Configuration>Release</Configuration>
34
+ <Platform>x64</Platform>
35
+ </ProjectConfiguration>
36
+ </ItemGroup>
37
+ <PropertyGroup Label="Globals">
38
+ <ProjectName>libusb-1.0 (dll)</ProjectName>
39
+ <ProjectGuid>{349EE8FA-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
40
+ <RootNamespace>libusbdll</RootNamespace>
41
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
42
+ <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
43
+ <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
44
+ </PropertyGroup>
45
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
46
+ <PropertyGroup Label="Configuration">
47
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
48
+ <CharacterSet>Unicode</CharacterSet>
49
+ <PlatformToolset>v141</PlatformToolset>
50
+ <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
51
+ </PropertyGroup>
52
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
53
+ <ImportGroup Label="ExtensionSettings">
54
+ </ImportGroup>
55
+ <ImportGroup Label="PropertySheets">
56
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57
+ </ImportGroup>
58
+ <PropertyGroup Label="UserMacros" />
59
+ <PropertyGroup>
60
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
61
+ <IntDir>$(ProjectDir)..\$(Platform)\$(Configuration)\dll\$(TargetName)\</IntDir>
62
+ <OutDir>$(ProjectDir)..\$(Platform)\$(Configuration)\dll\</OutDir>
63
+ <TargetName>libusb-1.0</TargetName>
64
+ </PropertyGroup>
65
+ <ItemDefinitionGroup>
66
+ <ClCompile>
67
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
68
+ <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
69
+ <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70
+ <WarningLevel>Level4</WarningLevel>
71
+ </ClCompile>
72
+ <ClCompile Condition="'$(Configuration)'=='Debug'">
73
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
74
+ <Optimization>Disabled</Optimization>
75
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
76
+ </ClCompile>
77
+ <ClCompile Condition="'$(Configuration)'=='Release'">
78
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
80
+ </ClCompile>
81
+ <Link>
82
+ <EmbedManagedResourceFile>libusb-1.0.rc;%(EmbedManagedResourceFile)</EmbedManagedResourceFile>
83
+ <ModuleDefinitionFile>..\libusb\libusb-1.0.def</ModuleDefinitionFile>
84
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
85
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
86
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
87
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
88
+ </Link>
89
+ <Link Condition="'$(Configuration)'=='Debug'">
90
+ <GenerateDebugInformation>true</GenerateDebugInformation>
91
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
92
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
93
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
94
+ <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
95
+ </Link>
96
+ </ItemDefinitionGroup>
97
+ <ItemGroup>
98
+ <ClCompile Include="..\libusb\core.c" />
99
+ <ClCompile Include="..\libusb\descriptor.c" />
100
+ <ClCompile Include="..\libusb\hotplug.c" />
101
+ <ClCompile Include="..\libusb\io.c" />
102
+ <ClCompile Include="..\libusb\os\poll_windows.c" />
103
+ <ClCompile Include="..\libusb\strerror.c" />
104
+ <ClCompile Include="..\libusb\sync.c" />
105
+ <ClCompile Include="..\libusb\os\threads_windows.c" />
106
+ <ClCompile Include="..\libusb\os\windows_nt_common.c" />
107
+ <ClCompile Include="..\libusb\os\windows_usbdk.c" />
108
+ <ClCompile Include="..\libusb\os\windows_winusb.c" />
109
+ </ItemGroup>
110
+ <ItemGroup>
111
+ <ClInclude Include=".\config.h" />
112
+ <ClInclude Include="..\libusb\hotplug.h" />
113
+ <ClInclude Include="..\libusb\libusb.h" />
114
+ <ClInclude Include="..\libusb\libusbi.h" />
115
+ <ClInclude Include="..\libusb\os\poll_windows.h" />
116
+ <ClInclude Include="..\libusb\os\threads_windows.h" />
117
+ <ClInclude Include="..\libusb\version.h" />
118
+ <ClInclude Include="..\libusb\version_nano.h" />
119
+ <ClInclude Include="..\libusb\os\windows_common.h" />
120
+ <ClInclude Include="..\libusb\os\windows_nt_common.h" />
121
+ <ClInclude Include="..\libusb\os\windows_nt_shared_types.h" />
122
+ <ClInclude Include="..\libusb\os\windows_usbdk.h" />
123
+ <ClInclude Include="..\libusb\os\windows_winusb.h" />
124
+ </ItemGroup>
125
+ <ItemGroup>
126
+ <None Include="..\libusb\libusb-1.0.def" />
127
+ </ItemGroup>
128
+ <ItemGroup>
129
+ <ResourceCompile Include="..\libusb\libusb-1.0.rc" />
130
+ </ItemGroup>
131
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
132
+ <ImportGroup Label="ExtensionTargets">
133
+ </ImportGroup>
134
+ </Project>
package/libusb/msvc/libusb_dll_wince.vcproj CHANGED
@@ -1190,6 +1190,10 @@
1190
1190
  RelativePath="errno.h"
1191
1191
  >
1192
1192
  </File>
1193
+ <File
1194
+ RelativePath="..\libusb\hotplug.h"
1195
+ >
1196
+ </File>
1193
1197
  <File
1194
1198
  RelativePath="..\libusb\libusb.h"
1195
1199
  >
@@ -1215,13 +1219,17 @@
1215
1219
  >
1216
1220
  </File>
1217
1221
  <File
1218
- RelativePath="..\libusb\os\wince_usb.h"
1222
+ RelativePath="..\libusb\version_nano.h"
1219
1223
  >
1220
1224
  </File>
1221
1225
  <File
1222
1226
  RelativePath="..\libusb\os\windows_common.h"
1223
1227
  >
1224
1228
  </File>
1229
+ <File
1230
+ RelativePath="..\libusb\os\wince_usb.h"
1231
+ >
1232
+ </File>
1225
1233
  </Filter>
1226
1234
  <Filter
1227
1235
  Name="Resource Files"
package/libusb/msvc/libusb_sources CHANGED
@@ -2,6 +2,8 @@
2
2
  TARGETNAME=libusb-1.0
3
3
  DLLDEF=..\libusb-1.0.def
4
4
 
5
+ _NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINXP)
6
+
5
7
  !IFNDEF MSC_WARNING_LEVEL
6
8
  MSC_WARNING_LEVEL=/W3
7
9
  !ENDIF
@@ -13,7 +15,7 @@ USE_MSVCRT=1
13
15
  !ENDIF
14
16
 
15
17
  INCLUDES=..;..\..\msvc;$(DDK_INC_PATH)
16
- C_DEFINES= $(C_DEFINES) $(LIBUSB_DEFINES) /DDDKBUILD
18
+ C_DEFINES=$(C_DEFINES) $(LIBUSB_DEFINES) /DDDKBUILD
17
19
 
18
20
  # http://jpassing.com/2009/10/21/ltcg-issues-with-the-win7amd64-environment-of-wdk-7600/
19
21
  # prevents the following error when using the 64 bit static lib with Visual Studio 2010:
@@ -24,15 +26,18 @@ C_DEFINES= $(C_DEFINES) $(LIBUSB_DEFINES) /DDDKBUILD
24
26
  # an older compiler than other objects; rebuild old objects and libraries"
25
27
  USER_C_FLAGS=/GL-
26
28
 
27
- TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib
29
+ TARGETLIBS=$(SDK_LIB_PATH)\advapi32.lib \
30
+ $(SDK_LIB_PATH)\kernel32.lib
28
31
 
29
32
  SOURCES=..\core.c \
30
33
  ..\descriptor.c \
34
+ ..\hotplug.c \
31
35
  ..\io.c \
36
+ poll_windows.c \
32
37
  ..\strerror.c \
33
38
  ..\sync.c \
34
- ..\hotplug.c \
35
39
  threads_windows.c \
36
- poll_windows.c \
37
- windows_usb.c \
40
+ windows_nt_common.c \
41
+ windows_usbdk.c \
42
+ windows_winusb.c \
38
43
  ..\libusb-1.0.rc
package/libusb/msvc/libusb_static.dsp CHANGED
@@ -119,7 +119,7 @@ SOURCE=..\libusb\os\threads_windows.c
119
119
  # End Source File
120
120
  # Begin Source File
121
121
 
122
- SOURCE=..\libusb\os\windows_usb.c
122
+ SOURCE=..\libusb\os\windows_winusb.c
123
123
  # End Source File
124
124
  # End Group
125
125
  # Begin Group "Header Files"
@@ -163,7 +163,7 @@ SOURCE=..\libusb\os\threads_windows.h
163
163
  # End Source File
164
164
  # Begin Source File
165
165
 
166
- SOURCE=..\libusb\os\windows_usb.h
166
+ SOURCE=..\libusb\os\windows_winusb.h
167
167
  # End Source File
168
168
  # Begin Source File
169
169
 
package/libusb/msvc/libusb_static_2005.vcproj CHANGED
@@ -297,6 +297,10 @@
297
297
  RelativePath="..\libusb\io.c"
298
298
  >
299
299
  </File>
300
+ <File
301
+ RelativePath="..\libusb\os\poll_windows.c"
302
+ >
303
+ </File>
300
304
  <File
301
305
  RelativePath="..\libusb\strerror.c"
302
306
  >
@@ -310,11 +314,15 @@
310
314
  >
311
315
  </File>
312
316
  <File
313
- RelativePath="..\libusb\os\poll_windows.c"
317
+ RelativePath="..\libusb\os\windows_nt_common.c"
314
318
  >
315
319
  </File>
316
320
  <File
317
- RelativePath="..\libusb\os\windows_usb.c"
321
+ RelativePath="..\libusb\os\windows_usbdk.c"
322
+ >
323
+ </File>
324
+ <File
325
+ RelativePath="..\libusb\os\windows_winusb.c"
318
326
  >
319
327
  </File>
320
328
  </Filter>
@@ -339,22 +347,42 @@
339
347
  RelativePath="..\libusb\libusbi.h"
340
348
  >
341
349
  </File>
350
+ <File
351
+ RelativePath="..\libusb\os\poll_windows.h"
352
+ >
353
+ </File>
342
354
  <File
343
355
  RelativePath="..\libusb\os\threads_windows.h"
344
356
  >
345
357
  </File>
346
358
  <File
347
- RelativePath="..\libusb\os\poll_windows.h"
359
+ RelativePath="..\libusb\version.h"
348
360
  >
349
361
  </File>
350
362
  <File
351
- RelativePath="..\libusb\os\windows_usb.h"
363
+ RelativePath="..\libusb\version_nano.h"
352
364
  >
353
365
  </File>
354
366
  <File
355
367
  RelativePath="..\libusb\os\windows_common.h"
356
368
  >
357
369
  </File>
370
+ <File
371
+ RelativePath="..\libusb\os\windows_nt_common.h"
372
+ >
373
+ </File>
374
+ <File
375
+ RelativePath="..\libusb\os\windows_nt_shared_types.h"
376
+ >
377
+ </File>
378
+ <File
379
+ RelativePath="..\libusb\os\windows_usbdk.h"
380
+ >
381
+ </File>
382
+ <File
383
+ RelativePath="..\libusb\os\windows_winusb.h"
384
+ >
385
+ </File>
358
386
  </Filter>
359
387
  </Files>
360
388
  <Globals>
package/libusb/msvc/libusb_static_2010.vcxproj CHANGED
@@ -24,104 +24,40 @@
24
24
  <RootNamespace>libusb</RootNamespace>
25
25
  </PropertyGroup>
26
26
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28
- <ConfigurationType>StaticLibrary</ConfigurationType>
29
- <CharacterSet>Unicode</CharacterSet>
30
- <WholeProgramOptimization>true</WholeProgramOptimization>
31
- </PropertyGroup>
32
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33
- <ConfigurationType>StaticLibrary</ConfigurationType>
34
- <CharacterSet>Unicode</CharacterSet>
35
- </PropertyGroup>
36
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37
- <ConfigurationType>StaticLibrary</ConfigurationType>
38
- <CharacterSet>Unicode</CharacterSet>
39
- <WholeProgramOptimization>true</WholeProgramOptimization>
40
- </PropertyGroup>
41
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
27
+ <PropertyGroup Label="Configuration">
42
28
  <ConfigurationType>StaticLibrary</ConfigurationType>
43
29
  <CharacterSet>Unicode</CharacterSet>
30
+ <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
44
31
  </PropertyGroup>
45
32
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46
33
  <ImportGroup Label="ExtensionSettings">
47
34
  </ImportGroup>
48
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
49
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
50
- </ImportGroup>
51
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
52
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
53
- </ImportGroup>
54
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56
- </ImportGroup>
57
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
35
+ <ImportGroup Label="PropertySheets">
58
36
  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59
37
  </ImportGroup>
60
38
  <PropertyGroup Label="UserMacros" />
61
39
  <PropertyGroup>
62
40
  <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
63
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
64
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
65
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
66
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
67
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
68
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
69
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
70
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
71
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
72
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
73
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
74
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
41
+ <IntDir>$(ProjectDir)..\$(Platform)\$(Configuration)\lib\$(TargetName)\</IntDir>
42
+ <OutDir>$(ProjectDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
43
+ <TargetName>libusb-1.0</TargetName>
75
44
  </PropertyGroup>
76
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
45
+ <ItemDefinitionGroup>
77
46
  <ClCompile>
78
- <Optimization>Disabled</Optimization>
47
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
79
48
  <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
80
- <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
49
+ <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
50
+ <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
82
51
  <WarningLevel>Level4</WarningLevel>
83
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
84
52
  </ClCompile>
85
- <Lib>
86
- <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
87
- </Lib>
88
- </ItemDefinitionGroup>
89
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
90
- <Midl>
91
- <TargetEnvironment>X64</TargetEnvironment>
92
- </Midl>
93
- <ClCompile>
53
+ <ClCompile Condition="'$(Configuration)'=='Debug'">
54
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
94
55
  <Optimization>Disabled</Optimization>
95
- <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96
- <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97
56
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
98
- <WarningLevel>Level4</WarningLevel>
99
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
100
57
  </ClCompile>
101
- <Lib>
102
- <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
103
- </Lib>
104
- </ItemDefinitionGroup>
105
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
106
- <ClCompile>
107
- <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
108
- <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58
+ <ClCompile Condition="'$(Configuration)'=='Release'">
59
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109
60
  <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
110
- <WarningLevel>Level4</WarningLevel>
111
- </ClCompile>
112
- <Lib>
113
- <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
114
- </Lib>
115
- </ItemDefinitionGroup>
116
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
117
- <Midl>
118
- <TargetEnvironment>X64</TargetEnvironment>
119
- </Midl>
120
- <ClCompile>
121
- <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122
- <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
124
- <WarningLevel>Level4</WarningLevel>
125
61
  </ClCompile>
126
62
  <Lib>
127
63
  <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
@@ -136,21 +72,26 @@
136
72
  <ClCompile Include="..\libusb\strerror.c" />
137
73
  <ClCompile Include="..\libusb\sync.c" />
138
74
  <ClCompile Include="..\libusb\os\threads_windows.c" />
139
- <ClCompile Include="..\libusb\os\windows_usb.c" />
75
+ <ClCompile Include="..\libusb\os\windows_nt_common.c" />
76
+ <ClCompile Include="..\libusb\os\windows_usbdk.c" />
77
+ <ClCompile Include="..\libusb\os\windows_winusb.c" />
140
78
  </ItemGroup>
141
79
  <ItemGroup>
142
80
  <ClInclude Include=".\config.h" />
143
81
  <ClInclude Include="..\libusb\hotplug.h" />
144
- <ClInclude Include="..\libusb\version.h" />
145
- <ClInclude Include="..\libusb\version_nano.h" />
146
82
  <ClInclude Include="..\libusb\libusb.h" />
147
83
  <ClInclude Include="..\libusb\libusbi.h" />
148
84
  <ClInclude Include="..\libusb\os\poll_windows.h" />
149
85
  <ClInclude Include="..\libusb\os\threads_windows.h" />
150
- <ClInclude Include="..\libusb\os\windows_usb.h" />
86
+ <ClInclude Include="..\libusb\version.h" />
87
+ <ClInclude Include="..\libusb\version_nano.h" />
151
88
  <ClInclude Include="..\libusb\os\windows_common.h" />
89
+ <ClInclude Include="..\libusb\os\windows_nt_common.h" />
90
+ <ClInclude Include="..\libusb\os\windows_nt_shared_types.h" />
91
+ <ClInclude Include="..\libusb\os\windows_usbdk.h" />
92
+ <ClInclude Include="..\libusb\os\windows_winusb.h" />
152
93
  </ItemGroup>
153
94
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
154
95
  <ImportGroup Label="ExtensionTargets">
155
96
  </ImportGroup>
156
- </Project>
97
+ </Project>
package/libusb/msvc/libusb_static_2012.vcxproj CHANGED
@@ -24,108 +24,41 @@
24
24
  <RootNamespace>libusb</RootNamespace>
25
25
  </PropertyGroup>
26
26
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28
- <ConfigurationType>StaticLibrary</ConfigurationType>
29
- <CharacterSet>Unicode</CharacterSet>
30
- <WholeProgramOptimization>true</WholeProgramOptimization>
31
- <PlatformToolset>v110</PlatformToolset>
32
- </PropertyGroup>
33
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34
- <ConfigurationType>StaticLibrary</ConfigurationType>
35
- <CharacterSet>Unicode</CharacterSet>
36
- <PlatformToolset>v110</PlatformToolset>
37
- </PropertyGroup>
38
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
39
- <ConfigurationType>StaticLibrary</ConfigurationType>
40
- <CharacterSet>Unicode</CharacterSet>
41
- <WholeProgramOptimization>true</WholeProgramOptimization>
42
- <PlatformToolset>v110</PlatformToolset>
43
- </PropertyGroup>
44
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
27
+ <PropertyGroup Label="Configuration">
45
28
  <ConfigurationType>StaticLibrary</ConfigurationType>
46
29
  <CharacterSet>Unicode</CharacterSet>
47
30
  <PlatformToolset>v110</PlatformToolset>
31
+ <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
48
32
  </PropertyGroup>
49
33
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50
34
  <ImportGroup Label="ExtensionSettings">
51
35
  </ImportGroup>
52
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
53
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54
- </ImportGroup>
55
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
56
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57
- </ImportGroup>
58
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
59
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60
- </ImportGroup>
61
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
36
+ <ImportGroup Label="PropertySheets">
62
37
  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63
38
  </ImportGroup>
64
39
  <PropertyGroup Label="UserMacros" />
65
40
  <PropertyGroup>
66
41
  <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
67
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
68
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
69
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
70
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
71
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
72
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
73
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
74
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\lib\libusb-1.0\</IntDir>
75
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libusb-1.0</TargetName>
76
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libusb-1.0</TargetName>
77
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libusb-1.0</TargetName>
78
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libusb-1.0</TargetName>
42
+ <IntDir>$(ProjectDir)..\$(Platform)\$(Configuration)\lib\$(TargetName)\</IntDir>
43
+ <OutDir>$(ProjectDir)..\$(Platform)\$(Configuration)\lib\</OutDir>
44
+ <TargetName>libusb-1.0</TargetName>
79
45
  </PropertyGroup>
80
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
46
+ <ItemDefinitionGroup>
81
47
  <ClCompile>
82
- <Optimization>Disabled</Optimization>
48
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
83
49
  <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
84
- <PreprocessorDefinitions>_WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
85
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
50
+ <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
51
+ <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
86
52
  <WarningLevel>Level4</WarningLevel>
87
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
88
53
  </ClCompile>
89
- <Lib>
90
- <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
91
- </Lib>
92
- </ItemDefinitionGroup>
93
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
94
- <Midl>
95
- <TargetEnvironment>X64</TargetEnvironment>
96
- </Midl>
97
- <ClCompile>
54
+ <ClCompile Condition="'$(Configuration)'=='Debug'">
55
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
98
56
  <Optimization>Disabled</Optimization>
99
- <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
100
- <PreprocessorDefinitions>_WIN32;_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101
57
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
102
- <WarningLevel>Level4</WarningLevel>
103
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
104
- </ClCompile>
105
- <Lib>
106
- <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
107
- </Lib>
108
- </ItemDefinitionGroup>
109
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
110
- <ClCompile>
111
- <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
112
- <PreprocessorDefinitions>_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
114
- <WarningLevel>Level4</WarningLevel>
115
58
  </ClCompile>
116
- <Lib>
117
- <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
118
- </Lib>
119
- </ItemDefinitionGroup>
120
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121
- <Midl>
122
- <TargetEnvironment>X64</TargetEnvironment>
123
- </Midl>
124
- <ClCompile>
125
- <AdditionalIncludeDirectories>.;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
126
- <PreprocessorDefinitions>_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59
+ <ClCompile Condition="'$(Configuration)'=='Release'">
60
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127
61
  <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
128
- <WarningLevel>Level4</WarningLevel>
129
62
  </ClCompile>
130
63
  <Lib>
131
64
  <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
@@ -140,21 +73,26 @@
140
73
  <ClCompile Include="..\libusb\strerror.c" />
141
74
  <ClCompile Include="..\libusb\sync.c" />
142
75
  <ClCompile Include="..\libusb\os\threads_windows.c" />
143
- <ClCompile Include="..\libusb\os\windows_usb.c" />
76
+ <ClCompile Include="..\libusb\os\windows_nt_common.c" />
77
+ <ClCompile Include="..\libusb\os\windows_usbdk.c" />
78
+ <ClCompile Include="..\libusb\os\windows_winusb.c" />
144
79
  </ItemGroup>
145
80
  <ItemGroup>
146
- <ClInclude Include="..\libusb\hotplug.h" />
147
- <ClInclude Include="..\libusb\version.h" />
148
- <ClInclude Include="..\libusb\version_nano.h" />
149
81
  <ClInclude Include=".\config.h" />
82
+ <ClInclude Include="..\libusb\hotplug.h" />
150
83
  <ClInclude Include="..\libusb\libusb.h" />
151
84
  <ClInclude Include="..\libusb\libusbi.h" />
152
85
  <ClInclude Include="..\libusb\os\poll_windows.h" />
153
86
  <ClInclude Include="..\libusb\os\threads_windows.h" />
154
- <ClInclude Include="..\libusb\os\windows_usb.h" />
87
+ <ClInclude Include="..\libusb\version.h" />
88
+ <ClInclude Include="..\libusb\version_nano.h" />
155
89
  <ClInclude Include="..\libusb\os\windows_common.h" />
90
+ <ClInclude Include="..\libusb\os\windows_nt_common.h" />
91
+ <ClInclude Include="..\libusb\os\windows_nt_shared_types.h" />
92
+ <ClInclude Include="..\libusb\os\windows_usbdk.h" />
93
+ <ClInclude Include="..\libusb\os\windows_winusb.h" />
156
94
  </ItemGroup>
157
95
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
158
96
  <ImportGroup Label="ExtensionTargets">
159
97
  </ImportGroup>
160
- </Project>
98
+ </Project>