From 658a4b1862a9f9c54c5fed0eafe1a3c265832071 Mon Sep 17 00:00:00 2001 From: Santiago Vila Date: Fri, 15 Apr 2016 11:29:30 +0200 Subject: [PATCH 1/2] Show mame's program name lowercase in help output. As the name of the binary is normally installed lowercase, the help output should also reflect this. --- src/emu/clifront.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp index 803b8a4db76..e2fe703adca 100644 --- a/src/emu/clifront.cpp +++ b/src/emu/clifront.cpp @@ -1713,14 +1713,14 @@ void cli_frontend::display_help() osd_printf_info("This software reproduces, more or less faithfully, the behaviour of a wide range\n" "of machines. But hardware is useless without software, so images of the ROMs and\n" "other media which run on that hardware are also required.\n\n"); - osd_printf_info("Usage: %s [machine] [media] [software] [options]",emulator_info::get_appname()); + osd_printf_info("Usage: %s [machine] [media] [software] [options]",emulator_info::get_appname_lower()); osd_printf_info("\n\n" " %s -showusage for a brief list of options\n" " %s -showconfig for a list of configuration options\n" " %s -listmedia for a full list of supported media\n" " %s -createconfig to create a %s.ini\n\n" - "For usage instructions, please consult the files config.txt and windows.txt.\n",emulator_info::get_appname(), - emulator_info::get_appname(),emulator_info::get_appname(),emulator_info::get_appname(),emulator_info::get_configname()); + "For usage instructions, please consult the files config.txt and windows.txt.\n",emulator_info::get_appname_lower(), + emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_configname()); } From aae47ddb1c20db83e18a19a0f00118fdca54c7ee Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Sat, 16 Apr 2016 00:33:34 +0200 Subject: [PATCH 2/2] Make display_help() use exename to print MAME's program name. Rework commit 658a4b1 to use exename instead of appname. --- src/emu/clifront.cpp | 10 +++++----- src/emu/clifront.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp index e2fe703adca..676c088a757 100644 --- a/src/emu/clifront.cpp +++ b/src/emu/clifront.cpp @@ -1586,7 +1586,7 @@ void cli_frontend::execute_commands(const char *exename) // help? if (strcmp(m_options.command(), CLICOMMAND_HELP) == 0) { - display_help(); + display_help(exename); return; } @@ -1707,20 +1707,20 @@ void cli_frontend::execute_commands(const char *exename) // output //------------------------------------------------- -void cli_frontend::display_help() +void cli_frontend::display_help(const char *exename) { osd_printf_info("%s v%s\n%s\n\n", emulator_info::get_appname(),build_version,emulator_info::get_copyright_info()); osd_printf_info("This software reproduces, more or less faithfully, the behaviour of a wide range\n" "of machines. But hardware is useless without software, so images of the ROMs and\n" "other media which run on that hardware are also required.\n\n"); - osd_printf_info("Usage: %s [machine] [media] [software] [options]",emulator_info::get_appname_lower()); + osd_printf_info("Usage: %s [machine] [media] [software] [options]",exename); osd_printf_info("\n\n" " %s -showusage for a brief list of options\n" " %s -showconfig for a list of configuration options\n" " %s -listmedia for a full list of supported media\n" " %s -createconfig to create a %s.ini\n\n" - "For usage instructions, please consult the files config.txt and windows.txt.\n",emulator_info::get_appname_lower(), - emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_appname_lower(),emulator_info::get_configname()); + "For usage instructions, please consult the files config.txt and windows.txt.\n",exename, + exename,exename,exename,emulator_info::get_configname()); } diff --git a/src/emu/clifront.h b/src/emu/clifront.h index 584261660db..b38a6361b18 100644 --- a/src/emu/clifront.h +++ b/src/emu/clifront.h @@ -59,7 +59,7 @@ public: private: // internal helpers void execute_commands(const char *exename); - void display_help(); + void display_help(const char *exename); void display_suggestions(const char *gamename); void output_single_softlist(FILE *out, software_list_device &swlist);