From 5d1de522b2d780e9197e901a924e2cb3be25d36e Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 3 Jan 2023 17:15:55 -0500 Subject: [PATCH] Make version flag `-v` and debug info consistent with menu bar text. --- adapters/standalone.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/adapters/standalone.cpp b/adapters/standalone.cpp index c873489a..940d645f 100644 --- a/adapters/standalone.cpp +++ b/adapters/standalone.cpp @@ -71,6 +71,7 @@ int main(int argc, char* argv[]) { std::string patchPath; bool screenshot = false; float screenshotZoom = 1.f; + const std::string appInfo = APP_NAME + " " + APP_EDITION_NAME + " " + APP_VERSION + " " + APP_OS_NAME + " " + APP_CPU_NAME; // Parse command line arguments static const struct option longOptions[] = { @@ -108,7 +109,7 @@ int main(int argc, char* argv[]) { asset::userDir = optarg; } break; case 'v': { - std::fprintf(stderr, "%s %s %s %s-%s\n", APP_NAME.c_str(), APP_EDITION_NAME.c_str(), APP_VERSION.c_str(), APP_OS.c_str(), APP_CPU.c_str()); + std::fprintf(stderr, "%s\n", appInfo.c_str()); return 0; } // Mac "app translocation" passes a nonsense -psn_... flag, so -p is reserved. @@ -142,7 +143,7 @@ int main(int argc, char* argv[]) { } // Log environment - INFO("%s %s %s", APP_NAME.c_str(), APP_EDITION_NAME.c_str(), APP_VERSION.c_str()); + INFO("%s", appInfo.c_str()); INFO("%s", system::getOperatingSystemInfo().c_str()); std::string argsList; for (int i = 0; i < argc; i++) {