Browse Source

Remove preprocessor directives from macro arguments

Preprocessor directives within macro arguments lead to undefined
behavior, and VC++ actually rejects them as compiler errors.
Matthias Hoelzl 7 years ago
parent
commit
1f6d766332
1 changed files with 5 additions and 5 deletions
  1. 5 5
      modules/mono/editor/godotsharp_builds.cpp

+ 5 - 5
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)"