godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12800 from hoelzl/pr-no-pp-directive-in-macro-arguments

Browse Source 
Remove preprocessor directives from macro arguments
This commit is contained in:
Rémi Verschelde 2017-11-10 10:18:52 +01:00 committed by GitHub
commit 118122be3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mono/editor/godotsharp_builds.cpp
View File

@ -365,14 +365,14 @@ GodotSharpBuilds::GodotSharpBuilds() {
// Build tool settings // Build tool settings
EditorSettings *ed_settings = EditorSettings::get_singleton(); EditorSettings *ed_settings = EditorSettings::get_singleton();
EDITOR_DEF("mono/builds/build_tool",
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
// TODO: Default to MSBUILD_MONO if its csc.exe issue is fixed in the installed mono version // TODO: Default to MSBUILD_MONO if its csc.exe issue is fixed in the installed mono version
MSBUILD EDITOR_DEF("mono/builds/build_tool", MSBUILD);
#else #else
MSBUILD_MONO EDITOR_DEF("mono/builds/build_tool", MSBUILD_MONO);
#endif #endif
);
ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/builds/build_tool", PROPERTY_HINT_ENUM, ed_settings->add_property_hint(PropertyInfo(Variant::INT, "mono/builds/build_tool", PROPERTY_HINT_ENUM,
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
"MSBuild (Mono),MSBuild (System)" "MSBuild (Mono),MSBuild (System)"