From 9c4d8f107baad85744d546201ea4a852bd207235 Mon Sep 17 00:00:00 2001 From: Jean-Paul Mari Date: Sun, 21 Apr 2019 22:36:56 -0400 Subject: [PATCH] The -d command line option, dedicated to the debugger, has been renamed to avoid duplication with the dsp one --- docs/vj_HistoryNotes.txt | 2 ++ src/gui/app.cpp | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/vj_HistoryNotes.txt b/docs/vj_HistoryNotes.txt index c9756bb..de608d4 100644 --- a/docs/vj_HistoryNotes.txt +++ b/docs/vj_HistoryNotes.txt @@ -85,6 +85,8 @@ Git commit: TBD 47) Added ELF sections check so a potential unknown section will stop, or not stop, the decoding 48) Project has switched to QT 5.12.0 library 64bits for VS 2017 49) Added a Save Dump As... feature to save a memory zone to a file +50) The -d command line option, dedicated to the debugger, has been renamed to avoid duplication with the dsp one +-- -d has been renamed by -D because another -d was also used for the dsp command line option Release 3 (13th November 2017) ------------------------------ diff --git a/src/gui/app.cpp b/src/gui/app.cpp index 63a2501..9392692 100644 --- a/src/gui/app.cpp +++ b/src/gui/app.cpp @@ -18,6 +18,7 @@ // JPM 09/ /2017 Added option (--dram-max) to support 8MB ram (which doesn't exist) // JPM Sept./2017 Added the 'Rx' word to the emulator name, updated the credits line, added option (--es-all, --es-ui, --es-alpine & --es-debugger) to support the erase settings // JPM Oct./2018 Added the Rx version's contact in the help text, added timer initialisation in the SDL_Init +// JPM Apr./2019 Fixed a command line option duplication // #include "app.h" @@ -187,7 +188,7 @@ bool ParseCommandLine(int argc, char * argv[]) " ---------------- -----------------------------------\n" " Name of file to autoload\n" " --alpine -a Put Virtual Jaguar into Alpine mode\n" - " --debugger -d Put Virtual Jaguar into Debugger mode\n" + " --debugger -D Put Virtual Jaguar into Debugger mode\n" " --pal -p PAL mode\n" " --ntsc -n NTSC mode\n" " --dram-max Set DRAM size to 8MB\n" @@ -252,7 +253,7 @@ bool ParseCommandLine(int argc, char * argv[]) } // Debugger mode - if ((strcmp(argv[i], "--debugger") == 0) || (strcmp(argv[i], "-d") == 0)) + if ((strcmp(argv[i], "--debugger") == 0) || (strcmp(argv[i], "-D") == 0)) { printf("Debugger mode enabled.\n"); vjs.softTypeDebugger = true; -- 2.20.1