From 108e743da8f68e4e1562434dff1f45fea605b510 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 13 Mar 2016 00:34:46 +0100 Subject: [PATCH] Windows build: added Hackrf plugin --- libhackrf/libhackrf.pro | 24 ++++++++++++++++ librtlsdr/librtlsdr.pro | 4 +-- plugins/samplesource/hackrf/hackrf.pro | 39 ++++++++++++++++++++++++++ sdrangel.windows.pro | 2 ++ windows.install.bat | 4 ++- 5 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 libhackrf/libhackrf.pro create mode 100644 plugins/samplesource/hackrf/hackrf.pro diff --git a/libhackrf/libhackrf.pro b/libhackrf/libhackrf.pro new file mode 100644 index 000000000..104d90973 --- /dev/null +++ b/libhackrf/libhackrf.pro @@ -0,0 +1,24 @@ +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +QT += core + +TEMPLATE = lib +TARGET = libhackrf + +CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host\libhackrf" +INCLUDEPATH += $$LIBHACKRFSRC/src + +CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\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(ANDROID):CONFIG += mobility +CONFIG(ANDROID):MOBILITY = diff --git a/librtlsdr/librtlsdr.pro b/librtlsdr/librtlsdr.pro index 8a0b195a6..8d77ccf19 100644 --- a/librtlsdr/librtlsdr.pro +++ b/librtlsdr/librtlsdr.pro @@ -12,7 +12,7 @@ TARGET = librtlsdr CONFIG(MINGW32):LIBRTLSDRSRC = "D:\softs\librtlsdr" INCLUDEPATH += $$LIBRTLSDRSRC/include -CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\ $$LIBRTLSDRSRC/src/tuner_e4k.c\ @@ -26,7 +26,7 @@ HEADERS = $$LIBRTLSDRSRC/include/rtl-sdr.h\ $$LIBRTLSDRSRC/include/rtl-sdr_export.h\ $$LIBRTLSDRSRC/src/getopt/getopt.h -CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/plugins/samplesource/hackrf/hackrf.pro b/plugins/samplesource/hackrf/hackrf.pro new file mode 100644 index 000000000..b0220b7d5 --- /dev/null +++ b/plugins/samplesource/hackrf/hackrf.pro @@ -0,0 +1,39 @@ +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui widgets multimedia + +TARGET = inputhackrf + +CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../sdrbase +INCLUDEPATH += $$LIBHACKRFSRC + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES += hackrfgui.cpp\ + hackrfinput.cpp\ + hackrfplugin.cpp\ + hackrfsettings.cpp\ + hackrfthread.cpp + +HEADERS += hackrfgui.h\ + hackrfinput.h\ + hackrfplugin.h\ + hackrfsettings.h\ + hackrfthread.h + +FORMS += hackrfgui.ui + +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase +LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf + +RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 04264031c..e8a0b9060 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -8,9 +8,11 @@ TEMPLATE = subdirs SUBDIRS = sdrbase SUBDIRS += lz4 SUBDIRS += librtlsdr +SUBDIRS += libhackrf SUBDIRS += plugins/samplesource/filesource SUBDIRS += plugins/samplesource/sdrdaemon SUBDIRS += plugins/samplesource/rtlsdr +SUBDIRS += plugins/samplesource/hackrf SUBDIRS += plugins/channel/chanalyzer SUBDIRS += plugins/channel/demodam SUBDIRS += plugins/channel/demodbfm diff --git a/windows.install.bat b/windows.install.bat index bbc9ef2ef..7febf9434 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -1,8 +1,9 @@ -SET libusbdir="D:\libusb-1.0.20\MinGW32" +SET libusbdir="D:\libusb-1.0.19\MinGW32" copy app\%1\sdrangel.exe %2 copy sdrbase\%1\sdrbase.dll %2 copy lz4\%1\lz4.dll %2 +copy libhackrf\%1\libhackrf.dll %2 copy librtlsdr\%1\librtlsdr.dll %2 copy %libusbdir%\dll\libusb-1.0.dll %2 mkdir %2\plugins @@ -20,3 +21,4 @@ copy plugins\channel\udpsrc\%1\udpsrc.dll %2\plugins\channel copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource copy plugins\samplesource\sdrdaemon\%1\inputsdrdaemon.dll %2\plugins\samplesource copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource +copy plugins\samplesource\hackrf\%1\inputhackrf.dll %2\plugins\samplesource