maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11871 from tagcup/fix_build

Browse source 
Fix mono enabled build
This commit is contained in:
Rémi Verschelde 2017-10-06 08:32:16 +02:00 committed by GitHub
parent d938de67ff 17e89c2c66
commit ba2c49531d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/mono/editor/godotsharp_builds.cpp
View file

@ -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"));
}

4
modules/mono/editor/godotsharp_editor.cpp
View file

@ -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"));
}