diff --git a/CMakeLists.txt b/CMakeLists.txt index 08fb9ca..34f1898 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,16 +76,6 @@ IF(ENABLE_DIGITAL_LAB) ADD_DEFINITIONS( -DENABLE_DIGITAL_LAB=1 ) -IF(MSVC) - SET (ENABLE_LIQUID_EXPERIMENTAL OFF CACHE BOOL "Enable experimental liquid-dsp features (requires latest liquid-dsp installed)") -ELSE() - SET (ENABLE_LIQUID_EXPERIMENTAL ON CACHE BOOL "Enable experimental liquid-dsp features (requires latest liquid-dsp installed)") -ENDIF() -IF(ENABLE_LIQUID_EXPERIMENTAL) -ADD_DEFINITIONS( - -DENABLE_LIQUID_EXPERIMENTAL=1 -) -ENDIF() ENDIF() set(USE_HAMLIB OFF CACHE BOOL "Support hamlib for radio control functions.") @@ -385,13 +375,8 @@ IF(ENABLE_DIGITAL_LAB) src/modules/modem/digital/ModemSQAM.cpp src/modules/modem/digital/ModemQAM.cpp src/modules/modem/digital/ModemQPSK.cpp - ) - IF(ENABLE_LIQUID_EXPERIMENTAL) - SET (cubicsdr_sources - ${cubicsdr_sources} src/modules/modem/digital/ModemFSK.cpp ) - ENDIF() ENDIF() SET (cubicsdr_headers @@ -506,13 +491,8 @@ SET (cubicsdr_headers src/modules/modem/digital/ModemSQAM.h src/modules/modem/digital/ModemQAM.h src/modules/modem/digital/ModemQPSK.h + src/modules/modem/digital/ModemFSK.h ) -IF(ENABLE_LIQUID_EXPERIMENTAL) - SET (cubicsdr_sources - ${cubicsdr_sources} - src/modules/modem/digital/ModemFSK.h - ) -ENDIF() ENDIF() diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp index 23c8705..522fd3b 100644 --- a/src/CubicSDR.cpp +++ b/src/CubicSDR.cpp @@ -270,9 +270,7 @@ bool CubicSDR::OnInit() { Modem::addModemFactory(ModemASK::factory, "ASK", 200000); Modem::addModemFactory(ModemBPSK::factory, "BPSK", 200000); Modem::addModemFactory(ModemDPSK::factory, "DPSK", 200000); -#if ENABLE_LIQUID_EXPERIMENTAL Modem::addModemFactory(ModemFSK::factory, "FSK", 19200); -#endif Modem::addModemFactory(ModemGMSK::factory, "GMSK", 19200); Modem::addModemFactory(ModemOOK::factory, "OOK", 200000); Modem::addModemFactory(ModemPSK::factory, "PSK", 200000); diff --git a/src/CubicSDR.h b/src/CubicSDR.h index cd2e63e..35136bd 100644 --- a/src/CubicSDR.h +++ b/src/CubicSDR.h @@ -44,9 +44,7 @@ #include "ModemASK.h" #include "ModemBPSK.h" #include "ModemDPSK.h" -#if ENABLE_LIQUID_EXPERIMENTAL #include "ModemFSK.h" -#endif #include "ModemGMSK.h" #include "ModemOOK.h" #include "ModemPSK.h"