From 30702558274e8eeeea414d4827ecb0b1964bf0b2 Mon Sep 17 00:00:00 2001 From: Edouard Griffiths Date: Mon, 9 May 2016 02:15:07 +0200 Subject: [PATCH] Updates for v1,2,1 Windows build --- dsdcc/dsdcc.pro | 2 ++ sdrbase/sdrbase.pro | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dsdcc/dsdcc.pro b/dsdcc/dsdcc.pro index f45d8cfdc..29ae111b9 100644 --- a/dsdcc/dsdcc.pro +++ b/dsdcc/dsdcc.pro @@ -18,6 +18,8 @@ CONFIG(MINGW64):LIBMBELIBSRC = "D:\softs\mbelib" INCLUDEPATH += $$LIBDSDCCSRC INCLUDEPATH += $$LIBMBELIBSRC +DEFINES += DSD_USE_MBELIB=1 + CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index db0d6390f..2bdc164ed 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -63,7 +63,7 @@ SOURCES += mainwindow.cpp\ gui/glspectrumgui.cpp\ gui/indicator.cpp\ gui/pluginsdialog.cpp\ - gui/preferencesdialog.cpp\ + gui/audiodialog.cpp\ gui/presetitem.cpp\ gui/rollupwidget.cpp\ gui/scale.cpp\ @@ -124,6 +124,7 @@ HEADERS += mainwindow.h\ dsp/threadedsamplesink.h\ gui/aboutdialog.h\ gui/addpresetdialog.h\ + gui/audiodialog.h\ gui/basicchannelsettingswidget.h\ gui/buttonswitch.h\ gui/channelwindow.h\ @@ -137,7 +138,6 @@ HEADERS += mainwindow.h\ gui/indicator.h\ gui/physicalunit.h\ gui/pluginsdialog.h\ - gui/preferencesdialog.h\ gui/presetitem.h\ gui/rollupwidget.h\ gui/scale.h\ @@ -165,7 +165,7 @@ FORMS += mainwindow.ui\ gui/scopewindow.ui\ gui/addpresetdialog.ui\ gui/basicchannelsettingswidget.ui\ - gui/preferencesdialog.ui\ + gui/audiodialog.ui\ gui/glscopegui.ui\ gui/aboutdialog.ui\ gui/pluginsdialog.ui\