(retroarch.c) Fix cli options without short variant

This commit is contained in:
Higor Eurípedes 2015-06-17 21:30:53 -03:00
parent 76dcadf0de
commit a61b9e31ec
1 changed files with 15 additions and 12 deletions

View File

@ -72,11 +72,13 @@ enum {
RA_OPT_IPS, RA_OPT_IPS,
RA_OPT_NO_PATCH, RA_OPT_NO_PATCH,
RA_OPT_RECORDCONFIG, RA_OPT_RECORDCONFIG,
RA_OPT_SUBSYSTEM,
RA_OPT_SIZE, RA_OPT_SIZE,
RA_OPT_FEATURES, RA_OPT_FEATURES,
RA_OPT_VERSION, RA_OPT_VERSION,
RA_OPT_EOF_EXIT, RA_OPT_EOF_EXIT,
RA_OPT_LOG_FILE, RA_OPT_LOG_FILE,
RA_OPT_MAX_FRAMES
}; };
#include "config.features.h" #include "config.features.h"
@ -474,7 +476,7 @@ static void parse_input(int argc, char *argv[])
{ "save", 1, NULL, 's' }, { "save", 1, NULL, 's' },
{ "fullscreen", 0, NULL, 'f' }, { "fullscreen", 0, NULL, 'f' },
{ "record", 1, NULL, 'r' }, { "record", 1, NULL, 'r' },
{ "recordconfig", 1, &val, 'R' }, { "recordconfig", 1, &val, RA_OPT_RECORDCONFIG },
{ "size", 1, &val, RA_OPT_SIZE }, { "size", 1, &val, RA_OPT_SIZE },
{ "verbose", 0, NULL, 'v' }, { "verbose", 0, NULL, 'v' },
{ "config", 1, NULL, 'c' }, { "config", 1, NULL, 'c' },
@ -493,7 +495,7 @@ static void parse_input(int argc, char *argv[])
{ "port", 1, &val, RA_OPT_PORT }, { "port", 1, &val, RA_OPT_PORT },
{ "spectate", 0, &val, RA_OPT_SPECTATE }, { "spectate", 0, &val, RA_OPT_SPECTATE },
#endif #endif
{ "nick", 1, &val, 'N' }, { "nick", 1, &val, RA_OPT_NICK },
#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
{ "command", 1, &val, RA_OPT_COMMAND }, { "command", 1, &val, RA_OPT_COMMAND },
#endif #endif
@ -503,8 +505,8 @@ static void parse_input(int argc, char *argv[])
{ "no-patch", 0, &val, RA_OPT_NO_PATCH }, { "no-patch", 0, &val, RA_OPT_NO_PATCH },
{ "detach", 0, NULL, 'D' }, { "detach", 0, NULL, 'D' },
{ "features", 0, &val, RA_OPT_FEATURES }, { "features", 0, &val, RA_OPT_FEATURES },
{ "subsystem", 1, NULL, 'Z' }, { "subsystem", 1, &val, RA_OPT_SUBSYSTEM },
{ "max-frames", 1, NULL, 'm' }, { "max-frames", 1, &val, RA_OPT_MAX_FRAMES },
{ "eof-exit", 0, &val, RA_OPT_EOF_EXIT }, { "eof-exit", 0, &val, RA_OPT_EOF_EXIT },
{ "version", 0, &val, RA_OPT_VERSION }, { "version", 0, &val, RA_OPT_VERSION },
#ifdef HAVE_FILE_LOGGER #ifdef HAVE_FILE_LOGGER
@ -548,10 +550,6 @@ static void parse_input(int argc, char *argv[])
print_help(argv[0]); print_help(argv[0]);
exit(0); exit(0);
case 'Z':
strlcpy(global->subsystem, optarg, sizeof(global->subsystem));
break;
case 'd': case 'd':
{ {
unsigned id = 0; unsigned id = 0;
@ -711,10 +709,6 @@ static void parse_input(int argc, char *argv[])
#endif #endif
break; break;
case 'm':
runloop->frames.video.max = strtoul(optarg, NULL, 10);
break;
case 0: /* options without short variant */ case 0: /* options without short variant */
switch (val) switch (val)
{ {
@ -788,6 +782,15 @@ static void parse_input(int argc, char *argv[])
strlcpy(global->record.config, optarg, strlcpy(global->record.config, optarg,
sizeof(global->record.config)); sizeof(global->record.config));
break; break;
case RA_OPT_MAX_FRAMES:
runloop->frames.video.max = strtoul(optarg, NULL, 10);
break;
case RA_OPT_SUBSYSTEM:
strlcpy(global->subsystem, optarg, sizeof(global->subsystem));
break;
case RA_OPT_FEATURES: case RA_OPT_FEATURES:
print_features(); print_features();
exit(0); exit(0);