From f941887a22b4120d129cc071660dccba98495768 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 27 Jan 2019 18:26:00 +0100 Subject: [PATCH] Windows: fallen back to libusb 1.0.21 --- ReadmeDeveloper.md | 2 +- devices/devices.pro | 2 +- fcdhid/fcdhid.pro | 8 ++++---- fcdlib/fcdlib.pro | 12 ++++++------ libairspy/libairspy.pro | 12 ++++++------ libairspyhf/libairspyhf.pro | 12 ++++++------ libbladerf/libbladerf.pro | 4 ++-- libhackrf/libhackrf.pro | 12 ++++++------ libiio/libiio.pro | 8 ++++---- liblimesuite/liblimesuite.pro | 8 ++++---- libperseus/libperseus.pro | 8 ++++---- librtlsdr/librtlsdr.pro | 12 ++++++------ windows.install.bat | 2 +- windowsms.install.bat | 2 +- 14 files changed, 52 insertions(+), 52 deletions(-) diff --git a/ReadmeDeveloper.md b/ReadmeDeveloper.md index 09785d3a1..8c04464fb 100644 --- a/ReadmeDeveloper.md +++ b/ReadmeDeveloper.md @@ -58,7 +58,7 @@ At present the following plugins are available: - `AMDemodXxx` classes in `plugins/channelrx/demodam`: AM demodulator with audio output - `BFMDemodXxx` classes in `plugins/channelrx/demodbfm`: Broadcast FM demodulator with audio mono/stereo output and RDS - `DSDDemodXxx` classes in `plugins/channelrx/demoddsd`: Digital Speech demodulator/decoder built on top of the [DSDcc library](https://github.com/f4exb/dsdcc). Produces audio output and some communication data from various digital voice standards: DMR, dPMR, D-Star, Yaesu System Fusion (YSF). - - `LoraDemodXxx` classes in `plugins/channelrx/demodlora`: Decodes [LoRa](http://www.semtech.com/images/datasheet/an1200.22.pdf) transmissions. This is legacy code that is not very well maintained so it may or may not work. + - `LoraDemodXxx` classes in `plugins/channelrx/demodlora`: Decodes [LoRa](http://www.semtech.com/images/datasheet/an1200.21.pdf) transmissions. This is legacy code that is not very well maintained so it may or may not work. - `NFMDemodXxx` classes in `plugins/channelrx/demodnfm`: Narrowband FM demodulator with audio output. - `SSBDemodXxx` classes in `plugins/channelrx/demodssb`: SSB/DSB/CW demodulator with audio output. - `WFMDemodXxx` classes in `plugins/channelrx/demodwfm`: Wideband FM demodulator with audio output. This is a basic demodulator. diff --git a/devices/devices.pro b/devices/devices.pro index 4be2e0b0e..7678b8dc4 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -42,7 +42,7 @@ INCLUDEPATH += $$PWD INCLUDEPATH += ../exports INCLUDEPATH += ../sdrbase INCLUDEPATH += "C:\softs\boost_1_66_0" -INCLUDEPATH += "C:\softs\libusb-1.0.22\include" +INCLUDEPATH += "C:\softs\libusb-1.0.21\include" INCLUDEPATH += $$LIBBLADERF/include INCLUDEPATH += $$LIBHACKRFSRC macx { diff --git a/fcdhid/fcdhid.pro b/fcdhid/fcdhid.pro index 1b15218b6..f280cf13a 100644 --- a/fcdhid/fcdhid.pro +++ b/fcdhid/fcdhid.pro @@ -9,10 +9,10 @@ QT += core TEMPLATE = lib TARGET = fcdhid -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" CONFIG(MINGW32):DEFINES += MINGW32=1 -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" CONFIG(MINGW64):DEFINES += MINGW32=1 CONFIG(macx):INCLUDEPATH += "/opt/local/include" @@ -26,8 +26,8 @@ HEADERS = $$PWD/fcdhid.h\ $$PWD/hid-libusb.h\ $$PWD/hidapi.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -liconv -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 -liconv +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 -liconv +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 -liconv CONFIG(macx):LIBS += -L/opt/local/lib -lusb-1.0 -liconv macx { diff --git a/fcdlib/fcdlib.pro b/fcdlib/fcdlib.pro index 6fcbcbb66..dfc211df4 100644 --- a/fcdlib/fcdlib.pro +++ b/fcdlib/fcdlib.pro @@ -9,9 +9,9 @@ QT += core TEMPLATE = lib TARGET = fcdlib -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" -CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" SOURCES = $$PWD/fcdtraits.cpp\ $$PWD/fcdproplusconst.cpp\ @@ -21,9 +21,9 @@ HEADERS = $$PWD/fcdtraits.h\ $$PWD/fcdproplusconst.h\ $$PWD/fcdproconst.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 -CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 +CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.21\MS64\dll -llibusb-1.0 macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ diff --git a/libairspy/libairspy.pro b/libairspy/libairspy.pro index c13df9c81..1d7e7eb02 100644 --- a/libairspy/libairspy.pro +++ b/libairspy/libairspy.pro @@ -15,9 +15,9 @@ CONFIG(MSVC):LIBAIRSPYSRC = "C:\softs\libairspy\libairspy" INCLUDEPATH += $$LIBAIRSPYSRC/src -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\pthreads-w32\include" CONFIG(macx):INCLUDEPATH += "/opt/local/include" @@ -33,9 +33,9 @@ HEADERS = $$LIBAIRSPYSRC/src/airspy.h\ $$LIBAIRSPYSRC/src/iqconverter_int16.h\ $$LIBAIRSPYSRC/src/filters.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 -CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 +CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.21\MS64\dll -llibusb-1.0 CONFIG(MSVC):LIBS += -LC:\softs\pthreads-w32\lib\x64 -lpthreadVC2 macx { SOURCES = diff --git a/libairspyhf/libairspyhf.pro b/libairspyhf/libairspyhf.pro index 72ff1272a..fec7f4fc6 100644 --- a/libairspyhf/libairspyhf.pro +++ b/libairspyhf/libairspyhf.pro @@ -15,9 +15,9 @@ CONFIG(MSVC):LIBAIRSPYHFSRC = "C:\softs\airspyhf\libairspyhf" INCLUDEPATH += $$LIBAIRSPYHFSRC/src -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\pthreads-w32\include" CONFIG(macx):INCLUDEPATH += "/usr/local/include" @@ -28,9 +28,9 @@ HEADERS = $$LIBAIRSPYHFSRC/src/airspyhf.h\ $$LIBAIRSPYHFSRC/src/airspyhf_commands.h\ $$LIBAIRSPYHFSRC/src/iqbalancer.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 -CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 +CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.21\MS64\dll -llibusb-1.0 CONFIG(MSVC):LIBS += -LC:\softs\pthreads-w32\lib\x64 -lpthreadVC2 macx { SOURCES = diff --git a/libbladerf/libbladerf.pro b/libbladerf/libbladerf.pro index debe36a1b..790c876e5 100644 --- a/libbladerf/libbladerf.pro +++ b/libbladerf/libbladerf.pro @@ -155,8 +155,8 @@ HEADERS = $$PWD/mingw/common/include/host_config.h\ $$LIBBLADERFLIBSRC/include/libbladeRF.h\ $$LIBBLADERFLIBSRC/include/bladeRF1.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 macx { SOURCES = HEADERS = diff --git a/libhackrf/libhackrf.pro b/libhackrf/libhackrf.pro index fb0eef9fa..ed360bd6e 100644 --- a/libhackrf/libhackrf.pro +++ b/libhackrf/libhackrf.pro @@ -15,9 +15,9 @@ CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host\libhackrf" INCLUDEPATH += $$LIBHACKRFSRC/src -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\pthreads-w32\include" CONFIG(macx):INCLUDEPATH += "/opt/local/include" @@ -25,9 +25,9 @@ SOURCES = $$LIBHACKRFSRC/src/hackrf.c HEADERS = $$LIBHACKRFSRC/src/hackrf.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 -CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 +CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.21\MS64\dll -llibusb-1.0 CONFIG(MSVC):LIBS += -LC:\softs\pthreads-w32\lib\x64 -lpthreadVC2 macx { SOURCES = diff --git a/libiio/libiio.pro b/libiio/libiio.pro index bbde28890..9a24af903 100644 --- a/libiio/libiio.pro +++ b/libiio/libiio.pro @@ -17,8 +17,8 @@ DEFINES += LIBIIO_EXPORTS=1 INCLUDEPATH += $$PWD/includemw INCLUDEPATH += $$LIBIIOSRC -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" # LibXml2 Windows distribution from: # http://xmlsoft.org/sources/win32/ @@ -49,8 +49,8 @@ HEADERS = $$LIBIIOSRC/debug.h\ $$LIBIIOSRC/iio-private.h\ $$PWD/includemw/iio-config.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 CONFIG(MINGW32):LIBS += -LC:\softs\libxml2-2.7.8.win32\bin -llibxml2 CONFIG(MINGW64):LIBS += -LC:\softs\libxml2-2.9.3-win32-x86_64\bin -llibxml2-2 diff --git a/liblimesuite/liblimesuite.pro b/liblimesuite/liblimesuite.pro index 0fc93b83a..6cd05f788 100644 --- a/liblimesuite/liblimesuite.pro +++ b/liblimesuite/liblimesuite.pro @@ -19,8 +19,8 @@ CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite" CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite" CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-18.10.0" -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" macx { INCLUDEPATH += "/opt/local/include" @@ -95,8 +95,8 @@ HEADERS = $$LIBLIMESUITESRC/src/API/*.h\ $$LIBLIMESUITESRC/src/FPGA_common/*.h\ $$LIBLIMESUITESRC/src/HPM7/*.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 macx { SOURCES = HEADERS = diff --git a/libperseus/libperseus.pro b/libperseus/libperseus.pro index e8448c4e6..86678b185 100644 --- a/libperseus/libperseus.pro +++ b/libperseus/libperseus.pro @@ -16,8 +16,8 @@ CONFIG(MINGW64):LIBPERSEUSSRC = "C:\softs\libperseus-sdr" CONFIG(macx):LIBPERSEUSSRC = "../../../libperseus-sdr" INCLUDEPATH += $$LIBPERSEUSSRC/src -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include" CONFIG(macx):INCLUDEPATH += /opt/local/include SOURCES = fpga_data.c\ @@ -36,8 +36,8 @@ HEADERS = fpga_data.h\ $$LIBPERSEUSSRC/perseus-in.h\ $$LIBPERSEUSSRC/perseus-sdr.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 macx { HEADERS -= config.windows.h DEFINES += HAVE_LIBUSB_STRERROR diff --git a/librtlsdr/librtlsdr.pro b/librtlsdr/librtlsdr.pro index abf7835e3..5ea1ac5e4 100644 --- a/librtlsdr/librtlsdr.pro +++ b/librtlsdr/librtlsdr.pro @@ -15,9 +15,9 @@ CONFIG(MINGW32):LIBRTLSDRSRC = "C:\softs\librtlsdr" CONFIG(MINGW64):LIBRTLSDRSRC = "C:\softs\librtlsdr" CONFIG(MSVC):LIBRTLSDRSRC = "C:\softs\librtlsdr" -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" -CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.22\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\libusb-1.0.21\include\libusb-1.0" CONFIG(macx):INCLUDEPATH += /opt/local/include CONFIG(MSVC):INCLUDEPATH += "C:\softs\librtlsdr\include" @@ -42,9 +42,9 @@ HEADERS = $$LIBRTLSDRSRC/include/reg_field.h\ $$LIBRTLSDRSRC/src/getopt/getopt.h\ $$LIBRTLSDRSRC/src/convenience/convenience.h -CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.22\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.22\MinGW64\dll -llibusb-1.0 -CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.22\MS64\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 +CONFIG(MSVC):LIBS += -LC:\softs\libusb-1.0.21\MS64\dll -llibusb-1.0 macx { SOURCES = HEADERS = diff --git a/windows.install.bat b/windows.install.bat index 9e58f2b0f..2acc5c988 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -1,4 +1,4 @@ -SET libusbdir="C:\softs\libusb-1.0.22\MinGW32" +SET libusbdir="C:\softs\libusb-1.0.21\MinGW32" SET opencvdir="C:\softs\opencv\build\mw32\install\x86\mingw\bin" SET libxml2dir="C:\softs\libxml2-2.7.8.win32" SET libiconvdir="C:\softs\iconv-1.9.2.win32" diff --git a/windowsms.install.bat b/windowsms.install.bat index ea21ba9a5..6ccfe98a0 100644 --- a/windowsms.install.bat +++ b/windowsms.install.bat @@ -1,4 +1,4 @@ -SET libusbdir="C:\softs\libusb-1.0.22\MS64" +SET libusbdir="C:\softs\libusb-1.0.21\MS64" SET opencvdir="C:\softs\opencv\build\mw32\install\x86\mingw\bin" SET libxml2dir="C:\softs\libxml2-2.7.8.win32" SET libiconvdir="C:\softs\iconv-1.9.2.win32"