godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Add some mono root hint dirs for OSX

Browse Source 
Fixes #13355
This commit is contained in:
Ignacio Etcheverry
2018-09-06 19:38:24 +02:00
parent 691d4e3835
commit 61426464ea
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@
#include "godotsharp_builds.h"
#include "core/vector.h"
#include "main/main.h"
#include "../godotsharp_dirs.h"
@@ -50,6 +51,16 @@ void godot_icall_BuildInstance_ExitCallback(MonoString *p_solution, MonoString *
GodotSharpBuilds::get_singleton()->build_exit_callback(MonoBuildInfo(solution, config), p_exit_code);
}
static Vector<const char *> _get_msbuild_hint_dirs() {
Vector<const char *> ret;
#ifdef OSX_ENABLED
ret.push_back("/Library/Frameworks/Mono.framework/Versions/Current/bin/");
ret.push_back("/usr/local/var/homebrew/linked/mono/bin/");
#endif
ret.push_back("/opt/novell/mono/bin/");
return ret;
}
#ifdef UNIX_ENABLED
String _find_build_engine_on_unix(const String &p_name) {
String ret = path_which(p_name);
@@ -61,15 +72,9 @@ String _find_build_engine_on_unix(const String &p_name) {
if (ret_fallback.length())
return ret_fallback;
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/"
};
static Vector<const char *> locations = _get_msbuild_hint_dirs();
for (int i = 0; i < sizeof(locations) / sizeof(const char *); i++) {
for (int i = 0; i < locations.size(); i++) {
String hint_path = locations[i] + p_name;
if (FileAccess::exists(hint_path)) {