From f5911ec075e0284f287162c0cce0bda8f24758de Mon Sep 17 00:00:00 2001 From: Tom Early Date: Mon, 13 Jul 2020 14:55:41 -0700 Subject: [PATCH] fixed no G3 --- rconfig | 6 ++++-- src/cprotocols.cpp | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rconfig b/rconfig index 19090ff..8ee7d0d 100755 --- a/rconfig +++ b/rconfig @@ -74,7 +74,7 @@ WriteMemFile () { } WriteSRCHFile () { - local file + local file m file="$srch" echo "// Created on `date`" > $file echo "#define CALLSIGN \"${callsign}\"" >> $file @@ -101,7 +101,9 @@ WriteSRCHFile () { else m=${g3support} fi - [ $m ] || echo "#define NO_G3" >> $file + if [[ "$m" != true ]]; then + echo "#define NO_G3" >> $file + fi } WriteSRCMKFile () { diff --git a/src/cprotocols.cpp b/src/cprotocols.cpp index 4d951b7..75fd1b3 100644 --- a/src/cprotocols.cpp +++ b/src/cprotocols.cpp @@ -27,11 +27,15 @@ #include "cdextraprotocol.h" #include "cdplusprotocol.h" #include "cdcsprotocol.h" +#ifndef NO_XLX #include "cxlxprotocol.h" #include "cdmrplusprotocol.h" #include "cdmrmmdvmprotocol.h" #include "cysfprotocol.h" +#endif +#ifndef NO_G3 #include "cg3protocol.h" +#endif #include "cprotocols.h" ////////////////////////////////////////////////////////////////////////////////////////