Windows build: upgrade to libusb 1.0.22. Modified install script for BladeRF

devices/devices.pro

@@ -1,115 +1,115 @@
-#--------------------------------------------------------
-#
-# Pro file for Android and Windows builds with Qt Creator
-#
-#--------------------------------------------------------
-
-QT += core gui multimedia opengl
-
-TEMPLATE = lib
-TARGET = devices
-
-DEFINES += USE_SSE2=1
-QMAKE_CXXFLAGS += -msse2
-DEFINES += USE_SSSE3=1
-QMAKE_CXXFLAGS += -mssse3
-DEFINES += USE_SSE4_1=1
-QMAKE_CXXFLAGS += -msse4.1
-QMAKE_CXXFLAGS += -std=c++11
-macx:QMAKE_LFLAGS += -F/Library/Frameworks
-
-CONFIG(MINGW32):LIBBLADERF = "C:\Programs\bladeRF"
-CONFIG(MINGW64):LIBBLADERF = "C:\Programs\bladeRF"
-CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
-CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
-CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host"
-CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-17.12.0"
-CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
-CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite"
-CONFIG(MINGW32):LIBPERSEUSSRC = "C:\softs\libperseus-sdr"
-CONFIG(macx):LIBIIOSRC = "../../../libiio"
-CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio"
-CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio"
-
-INCLUDEPATH += $$PWD
-INCLUDEPATH += ../exports
-INCLUDEPATH += ../sdrbase
-INCLUDEPATH += $$LIBBLADERF/include
-INCLUDEPATH += $$LIBHACKRFSRC
-INCLUDEPATH += "C:\softs\boost_1_66_0"
-INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
-INCLUDEPATH += ../liblimesuite/srcmw
-INCLUDEPATH += $$LIBLIMESUITESRC/src
-INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002
-INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry
-INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common
-INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR
-INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m
-INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu
-INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
-INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
-INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
-INCLUDEPATH += $$LIBPERSEUSSRC
-!macx:INCLUDEPATH += $$LIBIIOSRC
-
-CONFIG(Release):build_subdir = release
-CONFIG(Debug):build_subdir = debug
-
-!macx:SOURCES += bladerf1/devicebladerf1.cpp\
-        bladerf1/devicebladerf1values.cpp\
-        bladerf1/devicebladerf1shared.cpp
-
-!macx:SOURCES += bladerf2/devicebladerf2.cpp\
-        bladerf2/devicebladerf2shared.cpp
-
-SOURCES += hackrf/devicehackrf.cpp\
-        hackrf/devicehackrfvalues.cpp\
-        hackrf/devicehackrfshared.cpp
-
-SOURCES += limesdr/devicelimesdr.cpp\
-        limesdr/devicelimesdrparam.cpp\
-        limesdr/devicelimesdrshared.cpp
-
-!macx:SOURCES += plutosdr/deviceplutosdr.cpp\
-        plutosdr/deviceplutosdrbox.cpp\
-        plutosdr/deviceplutosdrparams.cpp\
-        plutosdr/deviceplutosdrscan.cpp\
-        plutosdr/deviceplutosdrshared.cpp
-
-!macx:HEADERS += bladerf2/devicebladerf2.h\
-        bladerf2/devicebladerf2shared.h
-
-!macx:HEADERS += bladerf1/devicebladerf1.h\
-        bladerf1/devicebladerf1param.h\
-        bladerf1/devicebladerf1values.h\
-        bladerf1/devicebladerf1shared.h
-
-HEADERS  += hackrf/devicehackrf.h\
-        hackrf/devicehackrfparam.h\
-        hackrf/devicehackrfvalues.h\
-        hackrf/devicehackrfshared.h
-
-HEADERS += limesdr/devicelimesdr.h\
-        limesdr/devicelimesdrparam.h\
-        limesdr/devicelimesdrshared.h
-
-HEADERS += plutosdr/deviceplutosdr.h\
-        plutosdr/deviceplutosdrbox.h\
-        plutosdr/deviceplutosdrparams.h\
-        plutosdr/deviceplutosdrscan.h\
-        plutosdr/deviceplutosdrshared.h
-
-LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
-!macx {
-    LIBS += -L$$LIBBLADERF/lib -lbladeRF
-    LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
-    LIBS += -L../liblimesuite/$${build_subdir} -lliblimesuite
-    LIBS += -L../libiio/$${build_subdir} -llibiio
-}
-macx {
-    LIBS -= -L../libbladerf/$${build_subdir} -llibbladerf
-    LIBS -= -L../libhackrf/$${build_subdir} -llibhackrf
-    LIBS += -L/opt/local/lib -lhackrf
-    LIBS += -L/usr/local/lib -lLimeSuite
-    LIBS += -framework iio
-}
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+QT += core gui multimedia opengl
+
+TEMPLATE = lib
+TARGET = devices
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSSE3=1
+QMAKE_CXXFLAGS += -mssse3
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+QMAKE_CXXFLAGS += -std=c++11
+macx:QMAKE_LFLAGS += -F/Library/Frameworks
+
+CONFIG(MINGW32):LIBBLADERF = "C:\Programs\bladeRF"
+CONFIG(MINGW64):LIBBLADERF = "C:\Programs\bladeRF"
+CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
+CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
+CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host"
+CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-17.12.0"
+CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
+CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite"
+CONFIG(MINGW32):LIBPERSEUSSRC = "C:\softs\libperseus-sdr"
+CONFIG(macx):LIBIIOSRC = "../../../libiio"
+CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio"
+CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio"
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../exports
+INCLUDEPATH += ../sdrbase
+INCLUDEPATH += $$LIBBLADERF/include
+INCLUDEPATH += $$LIBHACKRFSRC
+INCLUDEPATH += "C:\softs\boost_1_66_0"
+INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
+INCLUDEPATH += ../liblimesuite/srcmw
+INCLUDEPATH += $$LIBLIMESUITESRC/src
+INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002
+INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry
+INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common
+INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR
+INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m
+INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu
+INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
+INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
+INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
+INCLUDEPATH += $$LIBPERSEUSSRC
+!macx:INCLUDEPATH += $$LIBIIOSRC
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+!macx:SOURCES += bladerf1/devicebladerf1.cpp\
+        bladerf1/devicebladerf1values.cpp\
+        bladerf1/devicebladerf1shared.cpp
+
+!macx:SOURCES += bladerf2/devicebladerf2.cpp\
+        bladerf2/devicebladerf2shared.cpp
+
+SOURCES += hackrf/devicehackrf.cpp\
+        hackrf/devicehackrfvalues.cpp\
+        hackrf/devicehackrfshared.cpp
+
+SOURCES += limesdr/devicelimesdr.cpp\
+        limesdr/devicelimesdrparam.cpp\
+        limesdr/devicelimesdrshared.cpp
+
+!macx:SOURCES += plutosdr/deviceplutosdr.cpp\
+        plutosdr/deviceplutosdrbox.cpp\
+        plutosdr/deviceplutosdrparams.cpp\
+        plutosdr/deviceplutosdrscan.cpp\
+        plutosdr/deviceplutosdrshared.cpp
+
+!macx:HEADERS += bladerf2/devicebladerf2.h\
+        bladerf2/devicebladerf2shared.h
+
+!macx:HEADERS += bladerf1/devicebladerf1.h\
+        bladerf1/devicebladerf1param.h\
+        bladerf1/devicebladerf1values.h\
+        bladerf1/devicebladerf1shared.h
+
+HEADERS  += hackrf/devicehackrf.h\
+        hackrf/devicehackrfparam.h\
+        hackrf/devicehackrfvalues.h\
+        hackrf/devicehackrfshared.h
+
+HEADERS += limesdr/devicelimesdr.h\
+        limesdr/devicelimesdrparam.h\
+        limesdr/devicelimesdrshared.h
+
+HEADERS += plutosdr/deviceplutosdr.h\
+        plutosdr/deviceplutosdrbox.h\
+        plutosdr/deviceplutosdrparams.h\
+        plutosdr/deviceplutosdrscan.h\
+        plutosdr/deviceplutosdrshared.h
+
+LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
+!macx {
+    LIBS += -L$$LIBBLADERF/lib -lbladeRF
+    LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
+    LIBS += -L../liblimesuite/$${build_subdir} -lliblimesuite
+    LIBS += -L../libiio/$${build_subdir} -llibiio
+}
+macx {
+    LIBS -= -L../libbladerf/$${build_subdir} -llibbladerf
+    LIBS -= -L../libhackrf/$${build_subdir} -llibhackrf
+    LIBS += -L/opt/local/lib -lhackrf
+    LIBS += -L/usr/local/lib -lLimeSuite
+    LIBS += -framework iio
+}

fcdhid/fcdhid.pro

@@ -9,10 +9,10 @@ QT += core
 TEMPLATE = lib
 TARGET = fcdhid
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
+CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
 CONFIG(MINGW32):DEFINES += MINGW32=1
 
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
+CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
 CONFIG(MINGW64):DEFINES += MINGW32=1
 
 CONFIG(macx):INCLUDEPATH += "/opt/local/include"
@@ -26,6 +26,6 @@ HEADERS = $$PWD/fcdhid.h\
     $$PWD/hid-libusb.h\
     $$PWD/hidapi.h
 
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 -liconv
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 -liconv
+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(macx):LIBS += -L/opt/local/lib -lusb-1.0 -liconv

fcdlib/fcdlib.pro

@@ -9,8 +9,8 @@ QT += core
 TEMPLATE = lib
 TARGET = fcdlib
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
+CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
+CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
 
 SOURCES = $$PWD/fcdtraits.cpp\
     $$PWD/fcdproplusconst.cpp\
@@ -20,5 +20,5 @@ HEADERS = $$PWD/fcdtraits.h\
     $$PWD/fcdproplusconst.h\
     $$PWD/fcdproconst.h
 
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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

libairspy/libairspy.pro

@@ -13,8 +13,8 @@ CONFIG(MINGW32):LIBAIRSPYSRC = "C:\softs\libairspy\libairspy"
 CONFIG(MINGW64):LIBAIRSPYSRC = "C:\softs\libairspy\libairspy"
 INCLUDEPATH += $$LIBAIRSPYSRC/src
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
+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"
 
 SOURCES = $$LIBAIRSPYSRC/src/airspy.c\
   $$LIBAIRSPYSRC/src/iqconverter_float.c\
@@ -26,8 +26,8 @@ HEADERS = $$LIBAIRSPYSRC/src/airspy.h\
   $$LIBAIRSPYSRC/src/iqconverter_int16.h\
   $$LIBAIRSPYSRC/src/filters.h
 
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libairspyhf/libairspyhf.pro

@@ -13,8 +13,8 @@ CONFIG(MINGW32):LIBAIRSPYHFSRC = "C:\softs\airspyhf\libairspyhf"
 CONFIG(MINGW64):LIBAIRSPYHFSRC = "C:\softs\airspyhf\libairspyhf"
 INCLUDEPATH += $$LIBAIRSPYHFSRC/src
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
+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"
 
 SOURCES = $$LIBAIRSPYHFSRC/src/airspyhf.c\
   $$LIBAIRSPYHFSRC/src/iqbalancer.c
@@ -23,8 +23,8 @@ HEADERS = $$LIBAIRSPYHFSRC/src/airspyhf.h\
   $$LIBAIRSPYHFSRC/src/airspyhf_commands.h\
   $$LIBAIRSPYHFSRC/src/iqbalancer.h
 
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libbladerf/libbladerf.pro

@@ -154,8 +154,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.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libhackrf/libhackrf.pro

@@ -13,15 +13,15 @@ CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host\libhackrf"
 CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host\libhackrf"
 INCLUDEPATH += $$LIBHACKRFSRC/src
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
+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"
 
 SOURCES = $$LIBHACKRFSRC/src/hackrf.c
 
 HEADERS = $$LIBHACKRFSRC/src/hackrf.h
 
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

libiio/libiio.pro

@@ -17,8 +17,8 @@ DEFINES += LIBIIO_EXPORTS=1
 INCLUDEPATH += $$PWD/includemw
 INCLUDEPATH += $$LIBIIOSRC
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
+CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
+CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\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.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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\libxml2-2.7.8.win32\bin -llibxml2
 CONFIG(MINGW64):LIBS += -LC:\softs\libxml2-2.9.3-win32-x86_64\bin -llibxml2-2

liblimesuite/liblimesuite.pro

@@ -18,8 +18,8 @@ QMAKE_CXXFLAGS += -std=c++11
 CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
 CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite"
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
+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 += "..\libsqlite3\src"
 #CONFIG(MINGW64):INCLUDEPATH += "..\libsqlite3\src"
@@ -88,8 +88,8 @@ HEADERS = $$LIBLIMESUITESRC/src/API/*.h\
     $$LIBLIMESUITESRC/src/FPGA_common/*.h\
     $$LIBLIMESUITESRC/src/HPM7/*.h
     
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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 += -L../libsqlite3/release -llibsqlite3
 #CONFIG(MINGW64):LIBS += -L../libsqlite3/release -llibsqlite3

libperseus/libperseus.pro

@@ -15,8 +15,8 @@ CONFIG(MINGW32):LIBPERSEUSSRC = "C:\softs\libperseus-sdr"
 CONFIG(MINGW64):LIBPERSEUSSRC = "C:\softs\libperseus-sdr"
 INCLUDEPATH += $$LIBPERSEUSSRC/src
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
+CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
+CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
 
 SOURCES = fpga_data.c\
   $$LIBPERSEUSSRC/fifo.c\
@@ -34,8 +34,8 @@ HEADERS = fpga_data.h\
   $$LIBPERSEUSSRC/perseus-in.h\
   $$LIBPERSEUSSRC/perseus-sdr.h
 
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

librtlsdr/librtlsdr.pro

@@ -13,8 +13,8 @@ CONFIG(MINGW32):LIBRTLSDRSRC = "C:\softs\librtlsdr"
 CONFIG(MINGW64):LIBRTLSDRSRC = "C:\softs\librtlsdr"
 INCLUDEPATH += $$LIBRTLSDRSRC/include
 
-CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
-CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0"
+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"
 
 SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\
     $$LIBRTLSDRSRC/src/tuner_e4k.c\
@@ -37,8 +37,8 @@ HEADERS = $$LIBRTLSDRSRC/include/reg_field.h\
     $$LIBRTLSDRSRC/src/getopt/getopt.h\
     $$LIBRTLSDRSRC/src/convenience/convenience.h
 
-CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
-CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
+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(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =

windows.install.bat

@@ -1,4 +1,4 @@
-SET libusbdir="C:\softs\libusb-1.0.20\MinGW32"
+SET libusbdir="C:\softs\libusb-1.0.22\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"
@@ -21,7 +21,7 @@ copy libhackrf\%1\libhackrf.dll %2
 copy librtlsdr\%1\librtlsdr.dll %2
 copy libairspy\%1\libairspy.dll %2
 copy libairspyhf\%1\libairspyhf.dll %2
-copy libbladerf\%1\libbladerf.dll %2
+REM copy libbladerf\%1\libbladerf.dll %2
 REM copy libsqlite3\%1\libsqlite3.dll %2
 copy liblimesuite\%1\liblimesuite.dll %2
 copy libiio\%1\libiio.dll %2
@@ -60,7 +60,8 @@ copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
 copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource
 copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource
 copy plugins\samplesource\airspyhf\%1\inputairspyhf.dll %2\plugins\samplesource
-copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource
+copy plugins\samplesource\bladerf1input\%1\inputbladerf1.dll %2\plugins\samplesource
+copy plugins\samplesource\bladerf2input\%1\inputbladerf2.dll %2\plugins\samplesource
 copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource
 copy plugins\samplesource\plutosdrinput\%1\inputplutosdr.dll %2\plugins\samplesource
 REM copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource