diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-02-20 11:14:16 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-02-21 13:22:19 +0100 |
| commit | 64bad562c25a93540effb78e4289cf90df4898af (patch) | |
| tree | 85a6eb1ff2294b01288b4b823f41da53351b9e9e /host/docs | |
| parent | ef00232f60777e0beab71cc749948e8389e3de84 (diff) | |
| download | uhd-64bad562c25a93540effb78e4289cf90df4898af.tar.gz uhd-64bad562c25a93540effb78e4289cf90df4898af.tar.bz2 uhd-64bad562c25a93540effb78e4289cf90df4898af.zip | |
docs: updated libusb and static lib info
* windows: point to appropriate libusb version instead of libusbx
* cmake: fixed command for static library build
Diffstat (limited to 'host/docs')
| -rw-r--r-- | host/docs/build.dox | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/docs/build.dox b/host/docs/build.dox index 01209bc3e..e08bc6bf3 100644 --- a/host/docs/build.dox +++ b/host/docs/build.dox @@ -61,7 +61,7 @@ Other compilers (or lower versions) may work, but are unsupported. - **Minimum Version:** 1.0 - **Usage:** build time + runtime (optional) - **Download URL:** http://sourceforge.net/projects/libusb/files/libusb-1.0/ -- **Download URL (Windows):** https://github.com/libusbx/libusbx +- **Download URL (Windows):** https://github.com/libusb/libusb ### Python @@ -148,7 +148,7 @@ so we must manually tell CMake how to locate the LibUSB header and lib. - Recommend the static `libusb-1.0.lib` to simplify runtime dependencies. - Check the box to enable USB support, click "Configure" and "Generate". -<b>Note:</b> On Windows, LibUSBx is required to use most USB3 controllers. +<b>Note:</b> On Windows, LibUSB v1.0.19 is required to use most USB3 controllers. \subsection build_in_msvc Build the project in MSVC - Open the generated project file in MSVC. @@ -208,7 +208,7 @@ the UHDConfig.cmake file that gets installed along with the UHD libraries. Using CMake, UHD can be built as a static library by switching on `ENABLE_STATIC_LIBS`. - cmake -DENABLE_STATIC_LIBS=On <path to UHD source> + cmake -DENABLE_STATIC_LIBS=ON <path to UHD source> When linking the static library, you must ensure that the library is loaded in its entirety, otherwise global objects aren't initialized |