diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-10 10:18:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-10 10:18:52 +0100 |
| commit | 118122be3a3a8547726cc97647dd5866ad4ab46e (patch) | |
| tree | 0111eadc2c2cf22ad7d5923dcc686e7fab8ea1ba | |
| parent | e2785fbdede5022bb4e2d48811ffef0c94efcc0f (diff) | |
| parent | 1f6d7663328a03e7f545b7963819092c4c8ce299 (diff) | |
Merge pull request #12800 from hoelzl/pr-no-pp-directive-in-macro-arguments
Remove preprocessor directives from macro arguments
| -rw-r--r-- | modules/mono/editor/godotsharp_builds.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index 24247ed3b4..b88d34fc33 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -365,14 +365,14 @@ GodotSharpBuilds::GodotSharpBuilds() { // Build tool settings EditorSettings *ed_settings = EditorSettings::get_singleton(); - EDITOR_DEF("mono/builds/build_tool", + #ifdef WINDOWS_ENABLED - // TODO: Default to MSBUILD_MONO if its csc.exe issue is fixed in the installed mono version - MSBUILD + // TODO: Default to MSBUILD_MONO if its csc.exe issue is fixed in the installed mono version + EDITOR_DEF("mono/builds/build_tool", MSBUILD); #else - MSBUILD_MONO + EDITOR_DEF("mono/builds/build_tool", MSBUILD_MONO); #endif - ); + ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/builds/build_tool", PROPERTY_HINT_ENUM, #ifdef WINDOWS_ENABLED "MSBuild (Mono),MSBuild (System)" |