VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 11:12:27 -04:00
Code Issues Projects Releases Wiki Activity

MacOS compatibility with serialDV

Browse Source
This commit is contained in:
f4exb 2019-10-12 05:39:41 +02:00
parent 73d3355914
commit 9a849a9bbb
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/CMakeLists.txt vendored
View File

@ -209,7 +209,7 @@ elseif(APPLE)
set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}") set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}")
endif() endif()
if(WIN32 OR LINUX) # Works on MacOS with a dummy serialDV
ExternalProject_Add(serialdv ExternalProject_Add(serialdv
GIT_REPOSITORY https://github.com/f4exb/serialDV.git GIT_REPOSITORY https://github.com/f4exb/serialDV.git
GIT_TAG ${SERIALDV_TAG} GIT_TAG ${SERIALDV_TAG}
@ -240,7 +240,6 @@ if(WIN32 OR LINUX)
FILES_MATCHING PATTERN "libserialdv*${CMAKE_SHARED_LIBRARY_SUFFIX}") FILES_MATCHING PATTERN "libserialdv*${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}") set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}")
endif() endif()
endif()
ExternalProject_Add(dsdcc ExternalProject_Add(dsdcc
GIT_REPOSITORY https://github.com/f4exb/dsdcc.git GIT_REPOSITORY https://github.com/f4exb/dsdcc.git

2
sdrgui/mainwindow.cpp
View File

@ -1671,8 +1671,10 @@ void MainWindow::on_action_DeviceUserArguments_triggered()
void MainWindow::on_action_AMBE_triggered() void MainWindow::on_action_AMBE_triggered()
{ {
qDebug("MainWindow::on_action_AMBE_triggered"); qDebug("MainWindow::on_action_AMBE_triggered");
#ifndef __APPLE__
AMBEDevicesDialog ambeDevicesDialog(m_dspEngine->getAMBEEngine(), this); AMBEDevicesDialog ambeDevicesDialog(m_dspEngine->getAMBEEngine(), this);
ambeDevicesDialog.exec(); ambeDevicesDialog.exec();
#endif
} }
void MainWindow::sampleSourceChanged() void MainWindow::sampleSourceChanged()