diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-05 11:54:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-05 11:54:26 +0100 |
| commit | 9a78efc7c270211e49fd7b2f071b61c706febffc (patch) | |
| tree | 8e65a2bc51b1faa54ff11ace97395e1c121e77d6 /modules/mono | |
| parent | a0ac0804ca34317faea1ee6dbc66037178b0f727 (diff) | |
| parent | 8e2a756eb89d0bc0a32bcec4276d8518db9cb9e2 (diff) | |
Merge pull request #12642 from BrainBlasted/fix_msbuild_unix
Added fallback for msbuild.exe.
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/SCsub | 4 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_builds.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/modules/mono/SCsub b/modules/mono/SCsub index 27e60c4623..18a20ecac4 100644 --- a/modules/mono/SCsub +++ b/modules/mono/SCsub @@ -84,12 +84,16 @@ def find_msbuild_unix(filename): hint_path = os.path.join(hint_dir, filename) if os.path.isfile(hint_path): return hint_path + elif os.path.isfile(hint_path + ".exe"): + return hint_path + ".exe" for hint_dir in os.environ["PATH"].split(os.pathsep): hint_dir = hint_dir.strip('"') hint_path = os.path.join(hint_dir, filename) if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK): return hint_path + if os.path.isfile(hint_path + ".exe") and os.access(hint_path + ".exe", os.X_OK): + return hint_path + ".exe" return None diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index dbe0cc294c..a26f36d64f 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -53,6 +53,10 @@ String _find_build_engine_on_unix(const String &p_name) { if (ret.length()) return ret; + String ret_fallback = path_which(p_name + ".exe"); + if (ret_fallback.length()) + return ret_fallback; + const char *locations[] = { #ifdef OSX_ENABLED "/Library/Frameworks/Mono.framework/Versions/Current/bin/", |