diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-06 08:32:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 08:32:16 +0200 |
| commit | ba2c49531d23093cbc46bb390d58cf1e60bf79d0 (patch) | |
| tree | fb03cf05e4cd71630fcfd1b84a509f276b16cda0 /modules/mono | |
| parent | d938de67fff288bf7f0a92fd51a2e890a1b5f245 (diff) | |
| parent | 17e89c2c6634bc5533144192dc229f25b6cfd645 (diff) | |
Merge pull request #11871 from tagcup/fix_build
Fix mono enabled build
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/editor/godotsharp_builds.cpp | 4 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_editor.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index bb4756e490..b7e3fb0a32 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -352,8 +352,8 @@ GodotSharpBuilds::GodotSharpBuilds() { // Build tool settings EditorSettings *ed_settings = EditorSettings::get_singleton(); - if (!ed_settings->has("mono/builds/build_tool")) { - ed_settings->set("mono/builds/build_tool", MSBUILD); + if (!ed_settings->has_setting("mono/builds/build_tool")) { + ed_settings->set_setting("mono/builds/build_tool", MSBUILD); } ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/builds/build_tool", PROPERTY_HINT_ENUM, "MSBuild (System),MSBuild (Mono),xbuild")); } diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp index 5aaf029495..30e7653256 100644 --- a/modules/mono/editor/godotsharp_editor.cpp +++ b/modules/mono/editor/godotsharp_editor.cpp @@ -237,8 +237,8 @@ GodotSharpEditor::GodotSharpEditor(EditorNode *p_editor) { // External editor settings EditorSettings *ed_settings = EditorSettings::get_singleton(); - if (!ed_settings->has("mono/editor/external_editor")) { - ed_settings->set("mono/editor/external_editor", EDITOR_NONE); + if (!ed_settings->has_setting("mono/editor/external_editor")) { + ed_settings->set_setting("mono/editor/external_editor", EDITOR_NONE); } ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/editor/external_editor", PROPERTY_HINT_ENUM, "None,MonoDevelop,Visual Studio,Visual Studio Code")); } |