diff options
author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-10-23 14:57:37 -0700 |
---|---|---|
committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-10-23 14:57:37 -0700 |
commit | c357a16e21bffe61a066f62b44096eced8f7962a (patch) | |
tree | 99c0d76ee24bee5bd4a83e9d51cc12de5b0cdad3 | |
parent | 7b352da2bf52d6c3e76bed8bab8c791abf61ac1b (diff) | |
parent | f759a6eb69c47be7b089212f635cc173617cf232 (diff) | |
download | uhd-c357a16e21bffe61a066f62b44096eced8f7962a.tar.gz uhd-c357a16e21bffe61a066f62b44096eced8f7962a.tar.bz2 uhd-c357a16e21bffe61a066f62b44096eced8f7962a.zip |
Merge branch 'maint'
-rw-r--r-- | host/docs/build.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/docs/build.rst b/host/docs/build.rst index 00f79aaaa..5512e71ae 100644 --- a/host/docs/build.rst +++ b/host/docs/build.rst @@ -64,7 +64,7 @@ LibUSB * **Minimum Version:** 1.0 * **Usage:** build time + runtime (optional) * **Download URL:** http://sourceforge.net/projects/libusb/files/libusb-1.0/ -* **Download URL (Windows binaries):** http://www.libusb.org/wiki/windows_backend#LatestBinarySnapshots +* **Download URL (Windows):** https://github.com/libusbx/libusbx ^^^^^^^^^^^^^^^^ Python @@ -169,7 +169,7 @@ Generate the project with CMake * Click "Generate", and a project file will be created in the build directory. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -LibUSB CMake notes +LibUSB notes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ On Windows, CMake does not have the advantage of **pkg-config**, so we must manually tell CMake how to locate the LibUSB header and lib. @@ -182,6 +182,8 @@ so we must manually tell CMake how to locate the LibUSB header and lib. * Check the box to enable USB support, click "Configure" and "Generate". +**Note:** On Windows, LibUSBx is required to use most USB3 controllers. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Build the project in MSVC ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |