From 0b9492472d5e70d9a5e0c065dd00cee5190e5a4f Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 8 Aug 2022 20:09:31 -0400 Subject: [PATCH] update display of host "version" information; --- HostMain.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/HostMain.cpp b/HostMain.cpp index 6d5ce36f..26cc49ab 100644 --- a/HostMain.cpp +++ b/HostMain.cpp @@ -51,6 +51,26 @@ using namespace lookups; #include #endif +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +#if defined(ENABLE_DMR) +#define DESCR_DMR "DMR, " +#else +#define DESCR_DMR "" +#endif +#if defined(ENABLE_P25) +#define DESCR_P25 "P25, " +#else +#define DESCR_P25 "" +#endif +#if defined(ENABLE_NXDN) +#define DESCR_NXDN "NXDN, " +#else +#define DESCR_NXDN "" +#endif + // --------------------------------------------------------------------------- // Macros // --------------------------------------------------------------------------- @@ -106,7 +126,7 @@ void fatal(const char* msg, ...) void usage(const char* message, const char* arg) { - ::fprintf(stdout, __PROG_NAME__ " %s (built %s)\r\n", __VER__, __BUILD__); + ::fprintf(stdout, __PROG_NAME__ " %s (" DESCR_DMR DESCR_P25 DESCR_NXDN "CW Id, Network) (built %s)", __VER__, __BUILD__); if (message != NULL) { ::fprintf(stderr, "%s: ", g_progExe.c_str()); ::fprintf(stderr, message, arg); @@ -163,7 +183,7 @@ int checkArgs(int argc, char* argv[]) p += 2; } else if (IS("-v")) { - ::fprintf(stdout, __PROG_NAME__ " %s (built %s)\r\n", __VER__, __BUILD__); + ::fprintf(stdout, __PROG_NAME__ " %s (" DESCR_DMR DESCR_P25 DESCR_NXDN "CW Id, Network) (built %s)", __VER__, __BUILD__); if (argc == 2) exit(EXIT_SUCCESS); }