summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Roldán Etcheverry <neikeq@users.noreply.github.com>2019-05-29 21:01:29 +0200
committerGitHub <noreply@github.com>2019-05-29 21:01:29 +0200
commit8c923fc61740afd560e6c814f7ef19b0cdc30112 (patch)
tree62b8d1abd22c6db01baacf734cc859a11da1df74
parentc11bf884e0a127fb714a575f40fdc0b73fe54f2d (diff)
parent5dc50327cf040fb7100204ff5679c66f5514a1a8 (diff)
Merge pull request #29290 from ShyRed/godefquo
Escape quote char for non-Windows OS
-rw-r--r--modules/mono/editor/godotsharp_builds.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp
index 9f132825fb..a962d6df27 100644
--- a/modules/mono/editor/godotsharp_builds.cpp
+++ b/modules/mono/editor/godotsharp_builds.cpp
@@ -369,7 +369,11 @@ bool GodotSharpBuilds::build_project_blocking(const String &p_config, const Vect
MonoBuildInfo build_info(GodotSharpDirs::get_project_sln_path(), p_config);
// Add Godot defines
+#ifdef WINDOWS_ENABLED
String constants = "GodotDefineConstants=\"";
+#else
+ String constants = "GodotDefineConstants=\\\"";
+#endif
for (int i = 0; i < p_godot_defines.size(); i++) {
constants += "GODOT_" + p_godot_defines[i].to_upper().replace("-", "_").replace(" ", "_").replace(";", "_") + ";";
@@ -379,7 +383,11 @@ bool GodotSharpBuilds::build_project_blocking(const String &p_config, const Vect
constants += "GODOT_REAL_T_IS_DOUBLE;";
#endif
+#ifdef WINDOWS_ENABLED
constants += "\"";
+#else
+ constants += "\\\"";
+#endif
build_info.custom_props.push_back(constants);
if (!GodotSharpBuilds::get_singleton()->build(build_info)) {