From b6204626392aaffd715cad2d4639804939a06d2a Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 12 Dec 2016 01:16:36 +0100 Subject: [PATCH] Windows build: added SSB Modulator and CW Keyer --- plugins/channeltx/modssb/modssb.pro | 37 +++++++++++++++++++++++++++++ sdrangel.windows.pro | 1 + sdrbase/sdrbase.pro | 5 ++++ windows.install.bat | 1 + windows64.install.bat | 1 + 5 files changed, 45 insertions(+) create mode 100644 plugins/channeltx/modssb/modssb.pro diff --git a/plugins/channeltx/modssb/modssb.pro b/plugins/channeltx/modssb/modssb.pro new file mode 100644 index 000000000..0ac4f8d33 --- /dev/null +++ b/plugins/channeltx/modssb/modssb.pro @@ -0,0 +1,37 @@ +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui widgets multimedia opengl + +TARGET = modssb + +DEFINES += USE_SSE2=1 +QMAKE_CXXFLAGS += -msse2 +DEFINES += USE_SSE4_1=1 +QMAKE_CXXFLAGS += -msse4.1 + +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../sdrbase + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES += ssbmod.cpp\ + ssbmodgui.cpp\ + ssbmodplugin.cpp + +HEADERS += ssbmod.h\ + ssbmodgui.h\ + ssbmodplugin.h + +FORMS += ssbmodgui.ui + +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase + +RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 7e01d3e35..4f4309992 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -38,6 +38,7 @@ SUBDIRS += plugins/channelrx/tcpsrc SUBDIRS += plugins/channelrx/udpsrc SUBDIRS += plugins/channeltx/modam SUBDIRS += plugins/channeltx/modnfm +SUBDIRS += plugins/channeltx/modssb # Main app must be last CONFIG += ordered diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index daf8a0df2..801126768 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -43,6 +43,7 @@ SOURCES += mainwindow.cpp\ dsp/upchannelizer.cpp\ dsp/channelmarker.cpp\ dsp/ctcssdetector.cpp\ + dsp/cwkeyer.cpp\ dsp/dspcommands.cpp\ dsp/dspengine.cpp\ dsp/dspdevicesourceengine.cpp\ @@ -80,6 +81,7 @@ SOURCES += mainwindow.cpp\ gui/buttonswitch.cpp\ gui/channelwindow.cpp\ gui/colormapper.cpp\ + gui/cwkeyergui.cpp\ gui/glscope.cpp\ gui/glscopegui.cpp\ gui/glshadersimple.cpp\ @@ -125,6 +127,7 @@ HEADERS += mainwindow.h\ dsp/downchannelizer.h\ dsp/upchannelizer.h\ dsp/channelmarker.h\ + dsp/cwkeyer.h\ dsp/complex.h\ dsp/decimators.h\ dsp/dspcommands.h\ @@ -177,6 +180,7 @@ HEADERS += mainwindow.h\ gui/buttonswitch.h\ gui/channelwindow.h\ gui/colormapper.h\ + gui/cwkeyergui.h\ gui/glscope.h\ gui/glscopegui.h\ gui/glshadersimple.h\ @@ -217,6 +221,7 @@ FORMS += mainwindow.ui\ gui/scopewindow.ui\ gui/addpresetdialog.ui\ gui/basicchannelsettingswidget.ui\ + gui/cwkeyergui.ui\ gui/audiodialog.ui\ gui/glscopegui.ui\ gui/aboutdialog.ui\ diff --git a/windows.install.bat b/windows.install.bat index 16c518005..e391cc3d3 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -28,6 +28,7 @@ copy plugins\channelrx\tcpsrc\%1\tcpsrc.dll %2\plugins\channelrx copy plugins\channelrx\udpsrc\%1\udpsrc.dll %2\plugins\channelrx copy plugins\channeltx\modam\%1\modam.dll %2\plugins\channeltx copy plugins\channeltx\modnfm\%1\modnfm.dll %2\plugins\channeltx +copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource copy plugins\samplesource\hackrf\%1\inputhackrf.dll %2\plugins\samplesource diff --git a/windows64.install.bat b/windows64.install.bat index 97bdee45d..03b896a7b 100644 --- a/windows64.install.bat +++ b/windows64.install.bat @@ -41,6 +41,7 @@ copy plugins\channelrx\tcpsrc\%1\tcpsrc.dll %2\plugins\channelrx copy plugins\channelrx\udpsrc\%1\udpsrc.dll %2\plugins\channelrx copy plugins\channeltx\modam\%1\modam.dll %2\plugins\channeltx copy plugins\channeltx\modnfm\%1\modnfm.dll %2\plugins\channeltx +copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx 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