VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-23 18:52:28 -04:00
Code Issues Projects Releases Wiki Activity

Fixed compilation errors

Browse Source
This commit is contained in:
f4exb 2017-12-14 21:03:11 +01:00
parent 731c2c3f60
commit f7733a49fc
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesink/filesink/CMakeLists.txt
View File

@ -1,5 +1,7 @@
project(filesink) project(filesink)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(filesink_SOURCES set(filesink_SOURCES
filesinkgui.cpp filesinkgui.cpp
filesinkoutput.cpp filesinkoutput.cpp
@ -23,6 +25,7 @@ set(filesink_FORMS
include_directories( include_directories(
. .
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
) )
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
@ -41,6 +44,7 @@ target_link_libraries(outputfilesink
${QT_LIBRARIES} ${QT_LIBRARIES}
sdrbase sdrbase
sdrgui sdrgui
swagger
) )
qt5_use_modules(outputfilesink Core Widgets) qt5_use_modules(outputfilesink Core Widgets)

4
plugins/samplesource/fcdpro/CMakeLists.txt
View File

@ -1,5 +1,7 @@
project(fcdpro) project(fcdpro)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(fcdpro_SOURCES set(fcdpro_SOURCES
fcdprogui.cpp fcdprogui.cpp
fcdproinput.cpp fcdproinput.cpp
@ -23,6 +25,7 @@ set(fcdpro_FORMS
include_directories( include_directories(
. .
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/fcdhid ${CMAKE_SOURCE_DIR}/fcdhid
${CMAKE_SOURCE_DIR}/fcdlib ${CMAKE_SOURCE_DIR}/fcdlib
) )
@ -48,6 +51,7 @@ target_link_libraries(inputfcdpro
fcdlib fcdlib
sdrbase sdrbase
sdrgui sdrgui
swagger
) )
qt5_use_modules(inputfcdpro Core Widgets) qt5_use_modules(inputfcdpro Core Widgets)

6
plugins/samplesource/fcdpro/fcdprogui.cpp
View File

@ -210,9 +210,9 @@ bool FCDProGui::deserialize(const QByteArray& data)
bool FCDProGui::handleMessage(const Message& message __attribute__((unused))) bool FCDProGui::handleMessage(const Message& message __attribute__((unused)))
{ {
if (BladerfInput::MsgStartStop::match(message)) if (FCDProInput::MsgStartStop::match(message))
{ {
BladerfInput::MsgStartStop& notif = (BladerfInput::MsgStartStop&) message; FCDProInput::MsgStartStop& notif = (FCDProInput::MsgStartStop&) message;
blockApplySettings(true); blockApplySettings(true);
ui->startStop->setChecked(notif.getStartStop()); ui->startStop->setChecked(notif.getStartStop());
blockApplySettings(false); blockApplySettings(false);
@ -449,7 +449,7 @@ void FCDProGui::on_startStop_toggled(bool checked)
{ {
if (m_doApplySettings) if (m_doApplySettings)
{ {
BladerfInput::MsgStartStop *message = BladerfInput::MsgStartStop::create(checked); FCDProInput::MsgStartStop *message = FCDProInput::MsgStartStop::create(checked);
m_sampleSource->getInputMessageQueue()->push(message); m_sampleSource->getInputMessageQueue()->push(message);
} }
} }

4
plugins/samplesource/fcdproplus/CMakeLists.txt
View File

@ -1,5 +1,7 @@
project(fcdproplus) project(fcdproplus)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(fcdproplus_SOURCES set(fcdproplus_SOURCES
fcdproplusgui.cpp fcdproplusgui.cpp
fcdproplusinput.cpp fcdproplusinput.cpp
@ -23,6 +25,7 @@ set(fcdproplus_FORMS
include_directories( include_directories(
. .
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/fcdhid ${CMAKE_SOURCE_DIR}/fcdhid
${CMAKE_SOURCE_DIR}/fcdlib ${CMAKE_SOURCE_DIR}/fcdlib
) )
@ -48,6 +51,7 @@ target_link_libraries(inputfcdproplus
fcdlib fcdlib
sdrbase sdrbase
sdrgui sdrgui
swagger
) )
qt5_use_modules(inputfcdproplus Core Widgets) qt5_use_modules(inputfcdproplus Core Widgets)

2
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
View File

@ -314,7 +314,7 @@ void FCDProPlusGui::on_startStop_toggled(bool checked)
{ {
if (m_doApplySettings) if (m_doApplySettings)
{ {
BladerfInput::MsgStartStop *message = BladerfInput::MsgStartStop::create(checked); FCDProPlusInput::MsgStartStop *message = FCDProPlusInput::MsgStartStop::create(checked);
m_sampleSource->getInputMessageQueue()->push(message); m_sampleSource->getInputMessageQueue()->push(message);
} }
} }