From 327452cb09ab9353ffa1d82f4646410fb5ebc227 Mon Sep 17 00:00:00 2001 From: Mads Ynddal Date: Tue, 10 Jul 2018 00:25:13 +0200 Subject: [PATCH] Added path for Mono installed through Homebrew On macOS, it is common to install packages like Mono through the third-party package-manager Homebrew. This commit simply adds an additional path to where Homebrew installs the Mono framework. (cherry picked from commit 39aabba0a9650e034cb87e7a2b6686882ba1a20b) --- modules/mono/SCsub | 2 +- modules/mono/editor/godotsharp_builds.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mono/SCsub b/modules/mono/SCsub index a1dfcf63775..5ef445fb488 100644 --- a/modules/mono/SCsub +++ b/modules/mono/SCsub @@ -88,7 +88,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 43d58caad27..b7fa0f5fea2 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/" };