godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 39aabba0a9)
This commit is contained in:
Mads Ynddal 2018-07-10 00:25:13 +02:00 committed by Hein-Pieter van Braam
parent c751b66d38
commit 327452cb09
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/SCsub
View File

@ -88,7 +88,7 @@ def find_msbuild_unix(filename):
hint_dirs = ['/opt/novell/mono/bin'] hint_dirs = ['/opt/novell/mono/bin']
if sys.platform == 'darwin': 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: for hint_dir in hint_dirs:
hint_path = os.path.join(hint_dir, filename) hint_path = os.path.join(hint_dir, filename)

1
modules/mono/editor/godotsharp_builds.cpp
View File

@ -64,6 +64,7 @@ String _find_build_engine_on_unix(const String &p_name) {
const char *locations[] = { const char *locations[] = {
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
"/Library/Frameworks/Mono.framework/Versions/Current/bin/", "/Library/Frameworks/Mono.framework/Versions/Current/bin/",
"/usr/local/var/homebrew/linked/mono/bin/",
#endif #endif
"/opt/novell/mono/bin/" "/opt/novell/mono/bin/"
}; };