VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
f4exb 2018-09-28 16:45:08 +02:00
parent 2a1f0a0d0e
commit 3ac55eacf3
12 changed files with 157 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/devices.pro
View File

@ -37,7 +37,7 @@ INCLUDEPATH += ../sdrbase
INCLUDEPATH += $$LIBBLADERF/include
INCLUDEPATH += $$LIBHACKRFSRC
INCLUDEPATH += "C:\softs\boost_1_66_0"
INCLUDEPATH += "C:\softs\libusb-1.0.20\include"
INCLUDEPATH += "C:\softs\libusb-1.0.22\include"
INCLUDEPATH += ../liblimesuite/srcmw
INCLUDEPATH += $$LIBLIMESUITESRC/src
INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002

8
fcdhid/fcdhid.pro
View File

@ -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

8
fcdlib/fcdlib.pro
View File

@ -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

8
libairspy/libairspy.pro
View File

@ -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 =

8
libairspyhf/libairspyhf.pro
View File

@ -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 =

4
libbladerf/libbladerf.pro
View File

@ -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 =

8
libhackrf/libhackrf.pro
View File

@ -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 =

8
libiio/libiio.pro
View File

@ -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

8
liblimesuite/liblimesuite.pro
View File

@ -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

8
libperseus/libperseus.pro
View File

@ -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 =

8
librtlsdr/librtlsdr.pro
View File

@ -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 =

7
windows.install.bat
View File

@ -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