From a65c9458edca2f9dfa1f06dc3c627f18c1278447 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 18 Jul 2022 15:25:15 +0200 Subject: [PATCH] Build M17 for Linux only --- CHANGELOG | 6 ++++++ CMakeLists.txt | 7 +++++-- debian/changelog | 6 ++++++ plugins/channelrx/CMakeLists.txt | 2 +- plugins/channelrx/demodm17/readme.md | 2 ++ plugins/channeltx/CMakeLists.txt | 2 +- plugins/channeltx/modm17/readme.md | 2 ++ 7 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8485d7e32..50b272707 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +sdrangel (7.5.1-1) unstable; urgency=medium + + * M17 is for Linux only + + -- Edouard Griffiths, F4EXB Mon, 18 Jul 2022 13:22:31 +0200 + sdrangel (7.5.0-1) unstable; urgency=medium * M17 mode implementation (mod and demod plugins). Issue #1259 diff --git a/CMakeLists.txt b/CMakeLists.txt index a65354a4f..096987ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # configure version set(sdrangel_VERSION_MAJOR "7") set(sdrangel_VERSION_MINOR "5") -set(sdrangel_VERSION_PATCH "0") +set(sdrangel_VERSION_PATCH "1") set(sdrangel_VERSION_SUFFIX "") # SDRAngel cmake options @@ -548,7 +548,10 @@ add_subdirectory(qrtplib) add_subdirectory(swagger) add_subdirectory(devices) add_subdirectory(sdrbench) -add_subdirectory(modems) + +if (LINUX) + add_subdirectory(modems) +endif() if (BUILD_GUI) add_subdirectory(sdrgui) diff --git a/debian/changelog b/debian/changelog index b102f058c..508a15fc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sdrangel (7.5.1-1) unstable; urgency=medium + + * M17 is for Linux only + + -- Edouard Griffiths, F4EXB Mon, 18 Jul 2022 13:22:31 +0200 + sdrangel (7.5.0-1) unstable; urgency=medium * M17 mode implementation (mod and demod plugins). Issue #1259 diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt index e482f8373..c6e8f6ed7 100644 --- a/plugins/channelrx/CMakeLists.txt +++ b/plugins/channelrx/CMakeLists.txt @@ -93,7 +93,7 @@ if (ENABLE_CHANNELRX_DEMODFREEDV AND CODEC2_FOUND) add_subdirectory(demodfreedv) endif() -if (ENABLE_CHANNELRX_DEMODM17 AND CODEC2_FOUND) +if (LINUX AND ENABLE_CHANNELRX_DEMODM17 AND CODEC2_FOUND) add_subdirectory(demodm17) endif() diff --git a/plugins/channelrx/demodm17/readme.md b/plugins/channelrx/demodm17/readme.md index 14f54835c..44d8ff1b3 100644 --- a/plugins/channelrx/demodm17/readme.md +++ b/plugins/channelrx/demodm17/readme.md @@ -2,6 +2,8 @@

Introduction

+This plugin is available only on Linux. + This plugin demodulates and decodes transmissions made in the [M17 protocol](https://spec.m17project.org/) M17 is a fully Open Source and Open Source audio codec based project (Codec2) for FM based digital voice amateur radio. More information is available [here](https://m17project.org/)

Main interface

diff --git a/plugins/channeltx/CMakeLists.txt b/plugins/channeltx/CMakeLists.txt index c8b81e3b6..4b5a8f90e 100644 --- a/plugins/channeltx/CMakeLists.txt +++ b/plugins/channeltx/CMakeLists.txt @@ -63,6 +63,6 @@ if (ENABLE_CHANNELTX_MODFREEDV AND CODEC2_FOUND) add_subdirectory(modfreedv) endif() -if (ENABLE_CHANNELTX_MODM17 AND CODEC2_FOUND) +if (LINUX AND ENABLE_CHANNELTX_MODM17 AND CODEC2_FOUND) add_subdirectory(modm17) endif() diff --git a/plugins/channeltx/modm17/readme.md b/plugins/channeltx/modm17/readme.md index 471977240..12d6d2c08 100644 --- a/plugins/channeltx/modm17/readme.md +++ b/plugins/channeltx/modm17/readme.md @@ -2,6 +2,8 @@

Introduction

+This plugin is available only on Linux. + This plugin encodes and modulates transmissions made in the [M17 protocol](https://spec.m17project.org/). M17 is a fully Open Source and Open Source audio codec based project (Codec2) for FM based digital voice amateur radio. More information is available [here](https://m17project.org/)

Main interface