mirror of https://github.com/f4exb/sdrangel.git
Windows build: upgrade libusb to 1.0.20
This commit is contained in:
parent
3dc18c675e
commit
d1696365d7
|
@ -33,7 +33,7 @@ Just update the following line with the location of your Boost installation:
|
|||
|
||||
<h4>USB support (libusb)</h4>
|
||||
|
||||
You have to download an archive of libusb that supports MinGW32 from the following [location](https://sourceforge.net/projects/libusb/files/libusb-1.0/). You will have the choice among various versions and various archive formats in each version folder. It works with version `1.0.19` and is untested with later version(s). In our example it will be installed in `D:\libusb-1.0.19`.
|
||||
You have to download an archive of libusb that supports MinGW32 from the following [location](https://sourceforge.net/projects/libusb/files/libusb-1.0/). You will have the choice among various versions and various archive formats in each version folder. It works with version `1.0.20`. In our example it will be installed in `D:\softs\libusb-1.0.20`.
|
||||
|
||||
You then need to update the .pro files that depend on libusb. They are:
|
||||
|
||||
|
@ -44,8 +44,8 @@ You then need to update the .pro files that depend on libusb. They are:
|
|||
|
||||
Just update the following lines with the location of your libusb installation:
|
||||
|
||||
- `CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"`
|
||||
- `CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0`
|
||||
- `CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"`
|
||||
- `CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0`
|
||||
|
||||
<h4>Airspy library (libairspy)</h4>
|
||||
|
||||
|
@ -161,4 +161,4 @@ It is possible to use a MinGW64 tool-chain by following these steps:
|
|||
|
||||
Use the `windeployqt.exe` of the MSys2 distribution to copy the base files to your target installation directory in a similar way as this is done for MinGW32 (see above).
|
||||
|
||||
The final packaging is done with the `windows64.install.bat` utility. Assuming `D:\development\sdrangel` is the root directory of your cloned source repository, `D:\msys64` is the installation directory of MSys2, `D:\libusb-1.0.19\MinGW64` is your libusb installation directory and `D:\Programs\sdrangel64` is your target installation directory do: `D:\development\sdrangel\windows64.install.bat release D:\Programs\sdrangel`. Modify the script if your MSys2 and libusb locations are different.
|
||||
The final packaging is done with the `windows64.install.bat` utility. Assuming `D:\development\sdrangel` is the root directory of your cloned source repository, `D:\msys64` is the installation directory of MSys2, `D:\softs\libusb-1.0.20\MinGW64` is your libusb installation directory and `D:\Programs\sdrangel64` is your target installation directory do: `D:\development\sdrangel\windows64.install.bat release D:\Programs\sdrangel`. Modify the script if your MSys2 and libusb locations are different.
|
||||
|
|
|
@ -9,10 +9,10 @@ QT += core
|
|||
TEMPLATE = lib
|
||||
TARGET = fcdhid
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include"
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include"
|
||||
CONFIG(MINGW32):DEFINES += MINGW32=1
|
||||
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include"
|
||||
CONFIG(MINGW64):DEFINES += MINGW32=1
|
||||
|
||||
SOURCES = $$PWD/hid-libusb.c\
|
||||
|
@ -22,5 +22,5 @@ HEADERS = $$PWD/fcdhid.h\
|
|||
$$PWD/hid-libusb.h\
|
||||
$$PWD/hidapi.h
|
||||
|
||||
CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 -liconv
|
||||
CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 -liconv
|
||||
CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 -liconv
|
||||
CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 -liconv
|
||||
|
|
|
@ -9,8 +9,8 @@ QT += core
|
|||
TEMPLATE = lib
|
||||
TARGET = fcdlib
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include"
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\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 += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0
|
||||
CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
|
||||
|
|
|
@ -13,8 +13,8 @@ CONFIG(MINGW32):LIBAIRSPYSRC = "D:\softs\libairspy\libairspy"
|
|||
CONFIG(MINGW64):LIBAIRSPYSRC = "D:\softs\libairspy\libairspy"
|
||||
INCLUDEPATH += $$LIBAIRSPYSRC/src
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\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 += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0
|
||||
CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
|
||||
|
||||
CONFIG(ANDROID):CONFIG += mobility
|
||||
CONFIG(ANDROID):MOBILITY =
|
||||
|
|
|
@ -25,8 +25,8 @@ INCLUDEPATH += $$LIBBLADERFCOMMONSRC/include
|
|||
INCLUDEPATH += $$LIBBLADERFCOMMONSRC/include/windows
|
||||
INCLUDEPATH += $$PWD/include
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
|
||||
SOURCES = $$LIBBLADERFLIBSRC/src/async.c\
|
||||
$$LIBBLADERFLIBSRC/src/bladerf_priv.c\
|
||||
|
@ -100,8 +100,8 @@ HEADERS = $$LIBBLADERFLIBSRC/src/async.h\
|
|||
$$PWD/include/backend/backend_config.h\
|
||||
$$PWD/include/version.h
|
||||
|
||||
CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0
|
||||
CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
|
||||
|
||||
CONFIG(ANDROID):CONFIG += mobility
|
||||
CONFIG(ANDROID):MOBILITY =
|
||||
|
|
|
@ -13,15 +13,15 @@ CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host\libhackrf"
|
|||
CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host\libhackrf"
|
||||
INCLUDEPATH += $$LIBHACKRFSRC/src
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
|
||||
SOURCES = $$LIBHACKRFSRC/src/hackrf.c
|
||||
|
||||
HEADERS = $$LIBHACKRFSRC/src/hackrf.h
|
||||
|
||||
CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0
|
||||
CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
|
||||
|
||||
CONFIG(ANDROID):CONFIG += mobility
|
||||
CONFIG(ANDROID):MOBILITY =
|
||||
|
|
|
@ -13,8 +13,8 @@ CONFIG(MINGW32):LIBRTLSDRSRC = "D:\softs\librtlsdr"
|
|||
CONFIG(MINGW64):LIBRTLSDRSRC = "D:\softs\librtlsdr"
|
||||
INCLUDEPATH += $$LIBRTLSDRSRC/include
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0"
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
|
||||
SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\
|
||||
$$LIBRTLSDRSRC/src/tuner_e4k.c\
|
||||
|
@ -28,8 +28,8 @@ HEADERS = $$LIBRTLSDRSRC/include/rtl-sdr.h\
|
|||
$$LIBRTLSDRSRC/include/rtl-sdr_export.h\
|
||||
$$LIBRTLSDRSRC/src/getopt/getopt.h
|
||||
|
||||
CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0
|
||||
CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
|
||||
|
||||
CONFIG(ANDROID):CONFIG += mobility
|
||||
CONFIG(ANDROID):MOBILITY =
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
SET libusbdir="D:\libusb-1.0.19\MinGW32"
|
||||
SET libusbdir="D:\softs\libusb-1.0.20\MinGW32"
|
||||
|
||||
copy app\%1\sdrangel.exe %2
|
||||
copy sdrbase\%1\sdrbase.dll %2
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
SET libusbdir="D:\libusb-1.0.19\MinGW64"
|
||||
SET libusbdir="D:\softs\libusb-1.0.20\MinGW64"
|
||||
SET msys2dir="D:\msys64"
|
||||
|
||||
copy %msys2dir%\mingw64\bin\libbz2-1.dll %2
|
||||
|
|
Loading…
Reference in New Issue