diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-26 07:29:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 07:29:25 +0200 |
| commit | 0a10e07124f949099dff479fe5e17b68316e668c (patch) | |
| tree | 5aca269638e8dd323df44ceeefed30dbdbeb047e /modules/mono | |
| parent | dcf0a60a52124b06b161cdaba7bce845b1f43f90 (diff) | |
| parent | 5ff4e0516b01f4bd1d5ffd80e35f8e9a623bca72 (diff) | |
Merge pull request #32352 from neikeq/issue-32237
Mono: Don't use project settings for debugger agent on exported games
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 915a01af7e..320d807563 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -119,26 +119,29 @@ void gdmono_debug_init() { 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); bool da_suspend = GLOBAL_DEF("mono/debugger_agent/wait_for_debugger", false); int da_timeout = GLOBAL_DEF("mono/debugger_agent/wait_timeout", 3000); - CharString da_args = OS::get_singleton()->get_environment("GODOT_MONO_DEBUGGER_AGENT").utf8(); - -#ifdef TOOLS_ENABLED if (Engine::get_singleton()->is_editor_hint() || ProjectSettings::get_singleton()->get_resource_path().empty() || Main::is_project_manager()) { if (da_args.size() == 0) return; } -#endif if (da_args.length() == 0) { 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")) .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 const char *options[] = { |