Browse Source

Merge pull request #11871 from tagcup/fix_build

Fix mono enabled build
Rémi Verschelde 7 years ago
parent
commit
ba2c49531d

+ 2 - 2
modules/mono/editor/godotsharp_builds.cpp

@@ -352,8 +352,8 @@ GodotSharpBuilds::GodotSharpBuilds() {
 
 
 	// Build tool settings
 	// Build tool settings
 	EditorSettings *ed_settings = EditorSettings::get_singleton();
 	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"));
 	ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/builds/build_tool", PROPERTY_HINT_ENUM, "MSBuild (System),MSBuild (Mono),xbuild"));
 }
 }

+ 2 - 2
modules/mono/editor/godotsharp_editor.cpp

@@ -237,8 +237,8 @@ GodotSharpEditor::GodotSharpEditor(EditorNode *p_editor) {
 
 
 	// External editor settings
 	// External editor settings
 	EditorSettings *ed_settings = EditorSettings::get_singleton();
 	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"));
 	ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/editor/external_editor", PROPERTY_HINT_ENUM, "None,MonoDevelop,Visual Studio,Visual Studio Code"));
 }
 }