summaryrefslogtreecommitdiff
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-11-11 23:21:31 -0500
committerbunnei <bunneidev@gmail.com>2015-11-11 23:21:31 -0500
commit43bb29edc5a07ee290a462dc72743d96eaadd70d (patch)
treec42780b313be023001c41c32a6f6090fe93c2afe /src/citra/citra.cpp
parent1463127fade260bb38dea80401380f24660ec778 (diff)
parentbcea9599100a0df945629cd50be066ae9dabf89f (diff)
Merge pull request #1122 from polaris-/gdbstub
gdbstub implementation
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 46f4a07c9..c96fc1374 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -23,6 +23,7 @@
#include "core/settings.h"
#include "core/system.h"
#include "core/core.h"
+#include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h"
#include "citra/config.h"
@@ -72,6 +73,8 @@ int main(int argc, char **argv) {
Config config;
log_filter.ParseFilterString(Settings::values.log_filter);
+ GDBStub::ToggleServer(Settings::values.use_gdbstub);
+ GDBStub::SetServerPort(static_cast<u32>(Settings::values.gdbstub_port));
EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;