From 6e1137a269da4388b2ee67348bc4beab2cbb6eef Mon Sep 17 00:00:00 2001 From: xhainingx Date: Fri, 12 Apr 2013 01:33:52 +0000 Subject: [PATCH] changed names of new command line args --abstartselectexit -> --4buttonexit --autosavestate -> --savestate --autoloadstate -> --loadstate --- trunk/SConstruct | 4 ++-- trunk/src/drivers/sdl/config.cpp | 6 +++--- trunk/src/drivers/sdl/sdl.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/trunk/SConstruct b/trunk/SConstruct index caa4c835..01c59902 100644 --- a/trunk/SConstruct +++ b/trunk/SConstruct @@ -14,8 +14,8 @@ import platform opts = Variables(None, ARGUMENTS) opts.AddVariables( - BoolVariable('DEBUG', 'Build with debugging symbols', 1), - BoolVariable('RELEASE', 'Set to 1 to build for release', 0), + BoolVariable('DEBUG', 'Build with debugging symbols', 0), + BoolVariable('RELEASE', 'Set to 1 to build for release', 1), BoolVariable('FRAMESKIP', 'Enable frameskipping', 1), BoolVariable('OPENGL', 'Enable OpenGL support', 1), BoolVariable('LUA', 'Enable Lua support', 1), diff --git a/trunk/src/drivers/sdl/config.cpp b/trunk/src/drivers/sdl/config.cpp index 948b09f6..b19d3d51 100644 --- a/trunk/src/drivers/sdl/config.cpp +++ b/trunk/src/drivers/sdl/config.cpp @@ -236,8 +236,8 @@ InitConfig() #endif - config->addOption("autoloadstate", "SDL.AutoLoadState", INVALID_STATE); - config->addOption("autosavestate", "SDL.AutoSaveState", INVALID_STATE); + config->addOption("loadstate", "SDL.AutoLoadState", INVALID_STATE); + config->addOption("savestate", "SDL.AutoSaveState", INVALID_STATE); #ifdef _GTK char* home_dir = getenv("HOME"); @@ -259,7 +259,7 @@ InitConfig() config->addOption("newppu", "SDL.NewPPU", 0); // quit when a+b+select+start is pressed - config->addOption("abstartselectexit", "SDL.ABStartSelectExit", 0); + config->addOption("4buttonexit", "SDL.ABStartSelectExit", 0); // GamePad 0 - 3 for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) { diff --git a/trunk/src/drivers/sdl/sdl.cpp b/trunk/src/drivers/sdl/sdl.cpp index f237de79..55d2c897 100644 --- a/trunk/src/drivers/sdl/sdl.cpp +++ b/trunk/src/drivers/sdl/sdl.cpp @@ -124,9 +124,9 @@ static const char *DriverUsage= " session.\n" "--rp2mic {0|1} Replace Port 2 Start with microphone (Famicom).\n" "--nogui Don't load the GTK GUI\n" -"--abstartselectexit {0|1} exit the emulator when A+B+Select+Start is pressed\n" -"--autosavestate {0-9|>9} load from the given state when the game is loaded\n" -"--autoloadstate {0-9|>9} save to the given state when the game is closed\n" +"--4buttonexit {0|1} exit the emulator when A+B+Select+Start is pressed\n" +"--savestate {0-9|>9} load from the given state when the game is loaded\n" +"--loadstate {0-9|>9} save to the given state when the game is closed\n" " to not save/load automatically provide a number\n" " greater than 9\n";