diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-18 08:29:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 08:29:37 +0200 |
| commit | 9bead2e06fa2866f7fb7cea8eefb6a4fd3225b23 (patch) | |
| tree | c9eeb0de212d265db1be96650f29970d6c28cc01 | |
| parent | bac99b6811bc1215c3bcadb2b5fe8174915932c2 (diff) | |
| parent | fb63ee52fbbc62ab3f1a08ede1f2bd05bfc01db5 (diff) | |
Merge pull request #12208 from neikeq/l
Mono: Fix build with tools=no or target=release
| -rw-r--r-- | modules/mono/csharp_script.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/signal_awaiter_utils.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 01ac4d83bb..7acfaaed86 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -51,6 +51,7 @@ #define CACHED_STRING_NAME(m_var) (CSharpLanguage::get_singleton()->get_string_names().m_var) +#ifdef TOOLS_ENABLED static bool _create_project_solution_if_needed() { String sln_path = GodotSharpDirs::get_project_sln_path(); @@ -65,6 +66,7 @@ static bool _create_project_solution_if_needed() { return true; } +#endif CSharpLanguage *CSharpLanguage::singleton = NULL; diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp index 99bcc72b41..7e99df29a1 100644 --- a/modules/mono/signal_awaiter_utils.cpp +++ b/modules/mono/signal_awaiter_utils.cpp @@ -119,7 +119,9 @@ void SignalAwaiterHandle::_bind_methods() { SignalAwaiterHandle::SignalAwaiterHandle(uint32_t p_managed_handle) : MonoGCHandle(p_managed_handle) { +#ifdef DEBUG_ENABLED conn_target_id = 0; +#endif } SignalAwaiterHandle::~SignalAwaiterHandle() { |