From 286ea814705500ceb372d88a4305459d35701c85 Mon Sep 17 00:00:00 2001 From: Edouard Griffiths Date: Wed, 27 Jul 2016 18:39:59 +0200 Subject: [PATCH] SDRdaemonFEC plugin: Windows build --- cm256cc/cm256cc.pro | 28 +++++++++++++++++++ .../sdrdaemonfec/sdrdaemonfec.pro | 11 ++++++++ sdrangel.windows.pro | 2 ++ windows64.install.bat | 2 ++ 4 files changed, 43 insertions(+) create mode 100644 cm256cc/cm256cc.pro diff --git a/cm256cc/cm256cc.pro b/cm256cc/cm256cc.pro new file mode 100644 index 000000000..0896f38b2 --- /dev/null +++ b/cm256cc/cm256cc.pro @@ -0,0 +1,28 @@ +#-------------------------------------------------------- +# +# Pro file for Windows builds with Qt Creator +# +#-------------------------------------------------------- + +QT += core + +TEMPLATE = lib +TARGET = cm256cc + +CONFIG(MINGW32):LIBCM256CCSRC = "D:\softs\cm256cc" +CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc" + +INCLUDEPATH += $$LIBCM256CCSRC + +DEFINES += __WINDOWS__=1 +DEFINES += USE_SIMD=1 +QMAKE_CXXFLAGS += -msse4.1 + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES = $$LIBCM256CCSRC/gf256.cpp\ +$$LIBCM256CCSRC/cm256.cpp + +HEADERS = $$LIBCM256CCSRC/gf256.h\ +$$LIBCM256CCSRC/cm256.h diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfec.pro b/plugins/samplesource/sdrdaemonfec/sdrdaemonfec.pro index c2e7f829e..975be2fcb 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfec.pro +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfec.pro @@ -14,14 +14,24 @@ TARGET = inputsdrdaemonfec CONFIG(MINGW32):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta" CONFIG(MINGW64):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta" +CONFIG(MINGW32):LIBCM256CCSRC = "D:\softs\cm256cc" +CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc" + INCLUDEPATH += $$PWD INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../lz4 INCLUDEPATH += $$LIBNANOMSGSRC/src +INCLUDEPATH += $$LIBCM256CCSRC + +DEFINES += USE_SIMD=1 +QMAKE_CXXFLAGS += -msse4.1 CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug +CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" + SOURCES += sdrdaemonfecbuffer.cpp\ sdrdaemonfecgui.cpp\ sdrdaemonfecinput.cpp\ @@ -39,6 +49,7 @@ FORMS += sdrdaemonfecgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../lz4/$${build_subdir} -llz4 LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg +LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index ff8e5a2e4..3bd72a45b 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -17,8 +17,10 @@ SUBDIRS += libbladerf SUBDIRS += mbelib SUBDIRS += dsdcc SUBDIRS += serialdv +CONFIG(MINGW64)SUBDIRS += cm256cc SUBDIRS += plugins/samplesource/filesource CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemon +CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonfec SUBDIRS += plugins/samplesource/rtlsdr SUBDIRS += plugins/samplesource/hackrf SUBDIRS += plugins/samplesource/airspy diff --git a/windows64.install.bat b/windows64.install.bat index ade75b886..d75eb7389 100644 --- a/windows64.install.bat +++ b/windows64.install.bat @@ -14,6 +14,7 @@ copy %msys2dir%\mingw64\bin\zlib1.dll %2 move %2\icudt56.dll %2\libicudt56.dll copy app\%1\sdrangel.exe %2 copy sdrbase\%1\sdrbase.dll %2 +copy cm256cc\%1\cm256cc.dll %2 copy mbelib\%1\mbelib.dll %2 copy dsdcc\%1\dsdcc.dll %2 copy serialdv\%1\serialdv.dll %2 @@ -38,6 +39,7 @@ copy plugins\channel\tcpsrc\%1\tcpsrc.dll %2\plugins\channel 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\sdrdaemonfec\%1\inputsdrdaemonfec.dll %2\plugins\samplesource copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource copy plugins\samplesource\hackrf\%1\inputhackrf.dll %2\plugins\samplesource copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource