notsoyuzu
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default to settings from ini for gdbstub

This commit is contained in:
polaris- 2016-04-06 22:27:28 -04:00
parent 44d746fc92
commit 64ec5ac356
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/citra/citra.cpp
View File

@ -43,8 +43,10 @@ static void PrintHelp()
/// Application entry point /// Application entry point
int main(int argc, char **argv) { int main(int argc, char **argv) {
Config config;
int option_index = 0; int option_index = 0;
u32 gdb_port = 0; bool use_gdbstub = Settings::values.use_gdbstub;
u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port);
char *endarg; char *endarg;
std::string boot_filename; std::string boot_filename;
@ -64,6 +66,7 @@ int main(int argc, char **argv) {
case 'g': case 'g':
errno = 0; errno = 0;
gdb_port = strtoul(optarg, &endarg, 0); gdb_port = strtoul(optarg, &endarg, 0);
use_gdbstub = true;
if (endarg == optarg) errno = EINVAL; if (endarg == optarg) errno = EINVAL;
if (errno != 0) { if (errno != 0) {
perror("--gdbport"); perror("--gdbport");
@ -88,13 +91,10 @@ int main(int argc, char **argv) {
return -1; return -1;
} }
Config config;
log_filter.ParseFilterString(Settings::values.log_filter); log_filter.ParseFilterString(Settings::values.log_filter);
if (gdb_port != 0) { GDBStub::ToggleServer(use_gdbstub);
GDBStub::ToggleServer(true); GDBStub::SetServerPort(gdb_port);
GDBStub::SetServerPort(gdb_port);
}
std::unique_ptr<EmuWindow_SDL2> emu_window = std::make_unique<EmuWindow_SDL2>(); std::unique_ptr<EmuWindow_SDL2> emu_window = std::make_unique<EmuWindow_SDL2>();