Merge pull request #10909 from unknownbrackets/debugger

WebSocket based debugger interface
This commit is contained in:
Unknown W. Brackets authored and GitHub committed 2018-06-09 15:37:06 -04:00
commit 9d96e6579c
61 files changed
+3655 -280

No files matched your search

+5 -3
View File
@@ -604,10 +604,12 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
screenManager->switchScreen(new LogoScreen());
}
if (g_Config.bRemoteShareOnStartup) {
// TODO: Separate config options.
if (g_Config.bRemoteShareOnStartup && g_Config.bRemoteDebuggerOnStartup)
StartWebServer(WebServerFlags::ALL);
}
else if (g_Config.bRemoteShareOnStartup)
StartWebServer(WebServerFlags::DISCS);
else if (g_Config.bRemoteDebuggerOnStartup)
StartWebServer(WebServerFlags::DEBUGGER);
std::string sysName = System_GetProperty(SYSPROP_NAME);
isOuya = KeyMap::IsOuya(sysName);