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

LimeRFE USB support: simplify LimeRFE support switch

Browse Source
This commit is contained in:
f4exb 2020-01-12 10:34:22 +01:00
parent ae07617c4e
commit c3981ef86b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -383,7 +383,7 @@ if(ENABLE_HACKRF)
endif() endif()
if(ENABLE_LIMESUITE) if(ENABLE_LIMESUITE)
find_package(LimeSuite) find_package(LimeSuite)
if (LIMERFE_FOUND) if (NOT APPLE AND LIMERFE_FOUND)
add_definitions(-DHAS_LIMERFE) add_definitions(-DHAS_LIMERFE)
endif() endif()
endif() endif()

6
sdrgui/mainwindow.cpp
View File

@ -80,7 +80,7 @@
#include <QDebug> #include <QDebug>
#include <QSplashScreen> #include <QSplashScreen>
#if defined(HAS_LIMERFE) and not defined(__APPLE__) #if defined(HAS_LIMERFE)
#include "limerfegui/limerfeusbdialog.h" #include "limerfegui/limerfeusbdialog.h"
#endif #endif
@ -250,7 +250,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
#ifdef __APPLE__ #ifdef __APPLE__
ui->menuPreferences->removeAction(ui->action_AMBE); ui->menuPreferences->removeAction(ui->action_AMBE);
#endif #endif
#if not defined(HAS_LIMERFE) or defined(__APPLE__) #if not defined(HAS_LIMERFE)
ui->menuPreferences->removeAction(ui->action_LimeRFE); ui->menuPreferences->removeAction(ui->action_LimeRFE);
#endif #endif
@ -1611,7 +1611,7 @@ void MainWindow::on_action_AMBE_triggered()
void MainWindow::on_action_LimeRFE_triggered() void MainWindow::on_action_LimeRFE_triggered()
{ {
qDebug("MainWindow::on_action_LimeRFE_triggered"); qDebug("MainWindow::on_action_LimeRFE_triggered");
#if defined(HAS_LIMERFE) and not defined(__APPLE__) #if defined(HAS_LIMERFE)
qDebug("MainWindow::on_action_LimeRFE_triggered: activated"); qDebug("MainWindow::on_action_LimeRFE_triggered: activated");
LimeRFEUSBDialog *limeRFEUSBDialog = new LimeRFEUSBDialog(this); LimeRFEUSBDialog *limeRFEUSBDialog = new LimeRFEUSBDialog(this);
limeRFEUSBDialog->setModal(false); limeRFEUSBDialog->setModal(false);