Disable --settings when using the SDL UI, closes #3950.
This commit is contained in:
@@ -542,7 +542,9 @@ usage:
|
|||||||
printf("-N or --noconfirm - do not ask for confirmation on quit\n");
|
printf("-N or --noconfirm - do not ask for confirmation on quit\n");
|
||||||
printf("-P or --vmpath path - set 'path' to be root for vm\n");
|
printf("-P or --vmpath path - set 'path' to be root for vm\n");
|
||||||
printf("-R or --rompath path - set 'path' to be ROM path\n");
|
printf("-R or --rompath path - set 'path' to be ROM path\n");
|
||||||
|
#ifndef USE_SDL_UI
|
||||||
printf("-S or --settings - show only the settings dialog\n");
|
printf("-S or --settings - show only the settings dialog\n");
|
||||||
|
#endif
|
||||||
printf("-V or --vmname name - overrides the name of the running VM\n");
|
printf("-V or --vmname name - overrides the name of the running VM\n");
|
||||||
printf("-X or --clear what - clears the 'what' (cmos/flash/both)\n");
|
printf("-X or --clear what - clears the 'what' (cmos/flash/both)\n");
|
||||||
printf("-Y or --donothing - do not show any UI or run the emulation\n");
|
printf("-Y or --donothing - do not show any UI or run the emulation\n");
|
||||||
@@ -609,8 +611,10 @@ usage:
|
|||||||
goto usage;
|
goto usage;
|
||||||
|
|
||||||
strcpy(vm_name, argv[++c]);
|
strcpy(vm_name, argv[++c]);
|
||||||
|
#ifndef USE_SDL_UI
|
||||||
} else if (!strcasecmp(argv[c], "--settings") || !strcasecmp(argv[c], "-S")) {
|
} else if (!strcasecmp(argv[c], "--settings") || !strcasecmp(argv[c], "-S")) {
|
||||||
settings_only = 1;
|
settings_only = 1;
|
||||||
|
#endif
|
||||||
} else if (!strcasecmp(argv[c], "--noconfirm") || !strcasecmp(argv[c], "-N")) {
|
} else if (!strcasecmp(argv[c], "--noconfirm") || !strcasecmp(argv[c], "-N")) {
|
||||||
confirm_exit_cmdl = 0;
|
confirm_exit_cmdl = 0;
|
||||||
} else if (!strcasecmp(argv[c], "--missing") || !strcasecmp(argv[c], "-M")) {
|
} else if (!strcasecmp(argv[c], "--missing") || !strcasecmp(argv[c], "-M")) {
|
||||||
|
@@ -229,5 +229,6 @@ if (QT)
|
|||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
add_subdirectory(win)
|
add_subdirectory(win)
|
||||||
else()
|
else()
|
||||||
|
add_compile_definitions(USE_SDL_UI)
|
||||||
add_subdirectory(unix)
|
add_subdirectory(unix)
|
||||||
endif()
|
endif()
|
||||||
|
Reference in New Issue
Block a user