VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows: fallen back to libusb 1.0.21

This commit is contained in:
f4exb 2019-01-27 18:26:00 +01:00
parent 4372938b15
commit f941887a22
14 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReadmeDeveloper.md
View File

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

2
devices/devices.pro
View File

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

8
fcdhid/fcdhid.pro
View File

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

12
fcdlib/fcdlib.pro
View File

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

12
libairspy/libairspy.pro
View File

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

12
libairspyhf/libairspyhf.pro
View File

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

4
libbladerf/libbladerf.pro
View File

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

12
libhackrf/libhackrf.pro
View File

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

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

8
liblimesuite/liblimesuite.pro
View File

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

8
libperseus/libperseus.pro
View File

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

12
librtlsdr/librtlsdr.pro
View File

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

2
windows.install.bat
View File

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

2
windowsms.install.bat
View File

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