diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-10 13:12:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 13:12:33 +0200 |
| commit | b01f036fb4dedaa3e0d9b36360ef08f706007a32 (patch) | |
| tree | 18fde2a6aef0afccb59f2e7264c4256d7bf30d79 | |
| parent | 229d217a51ae9bba3c356331574e8d0b0be7aa95 (diff) | |
| parent | 39aabba0a9650e034cb87e7a2b6686882ba1a20b (diff) | |
Merge pull request #20076 from Baekalfen/master
Added path for Mono installed through Homebrew
| -rw-r--r-- | modules/mono/SCsub | 2 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_builds.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/mono/SCsub b/modules/mono/SCsub index 89a3caf4e4..c69a3c9ba6 100644 --- a/modules/mono/SCsub +++ b/modules/mono/SCsub @@ -97,7 +97,7 @@ def find_msbuild_unix(filename): hint_dirs = ['/opt/novell/mono/bin'] if sys.platform == 'darwin': - hint_dirs = ['/Library/Frameworks/Mono.framework/Versions/Current/bin'] + hint_dirs + hint_dirs = ['/Library/Frameworks/Mono.framework/Versions/Current/bin', '/usr/local/var/homebrew/linked/mono/bin'] + hint_dirs for hint_dir in hint_dirs: hint_path = os.path.join(hint_dir, filename) diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index 156a01ff5a..b3b259e851 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -64,6 +64,7 @@ String _find_build_engine_on_unix(const String &p_name) { const char *locations[] = { #ifdef OSX_ENABLED "/Library/Frameworks/Mono.framework/Versions/Current/bin/", + "/usr/local/var/homebrew/linked/mono/bin/", #endif "/opt/novell/mono/bin/" }; |