godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mono: Don't use project settings for debugger agent on exported games 

(cherry picked from commit 5ff4e0516b)
This commit is contained in:
Ignacio Etcheverry 2019-09-25 22:02:24 +02:00 committed by Rémi Verschelde
parent c3aefbd1d2
commit 8b4eea3d6d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/mono/mono_gd/gd_mono.cpp
View File

@ -121,25 +121,28 @@ void gdmono_debug_init() {
mono_debug_init(MONO_DEBUG_FORMAT_MONO); mono_debug_init(MONO_DEBUG_FORMAT_MONO);
CharString da_args = OS::get_singleton()->get_environment("GODOT_MONO_DEBUGGER_AGENT").utf8();
#ifdef TOOLS_ENABLED
int da_port = GLOBAL_DEF("mono/debugger_agent/port", 23685); int da_port = GLOBAL_DEF("mono/debugger_agent/port", 23685);
bool da_suspend = GLOBAL_DEF("mono/debugger_agent/wait_for_debugger", false); bool da_suspend = GLOBAL_DEF("mono/debugger_agent/wait_for_debugger", false);
int da_timeout = GLOBAL_DEF("mono/debugger_agent/wait_timeout", 3000); int da_timeout = GLOBAL_DEF("mono/debugger_agent/wait_timeout", 3000);
#ifdef TOOLS_ENABLED
if (Engine::get_singleton()->is_editor_hint() || if (Engine::get_singleton()->is_editor_hint() ||
ProjectSettings::get_singleton()->get_resource_path().empty() || ProjectSettings::get_singleton()->get_resource_path().empty() ||
Main::is_project_manager()) { Main::is_project_manager()) {
return; return;
} }
#endif
CharString da_args = OS::get_singleton()->get_environment("GODOT_MONO_DEBUGGER_AGENT").utf8();
if (da_args.length() == 0) { if (da_args.length() == 0) {
da_args = String("--debugger-agent=transport=dt_socket,address=127.0.0.1:" + itos(da_port) + da_args = String("--debugger-agent=transport=dt_socket,address=127.0.0.1:" + itos(da_port) +
",embedding=1,server=y,suspend=" + (da_suspend ? "y,timeout=" + itos(da_timeout) : "n")) ",embedding=1,server=y,suspend=" + (da_suspend ? "y,timeout=" + itos(da_timeout) : "n"))
.utf8(); .utf8();
} }
#else
if (da_args.length() == 0)
return; // Exported games don't use the project settings to setup the debugger agent
#endif
// --debugger-agent=help // --debugger-agent=help
const char *options[] = { const char *options[] = {