diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-09 08:26:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-09 08:26:48 +0200 |
| commit | 29ca79bd68bbec3dfbaec659f82eee0b03363ba8 (patch) | |
| tree | 3b0fe9a42d9ce87e3336d95a70380958f9ffa649 /modules/mono/mono_gd/gd_mono.cpp | |
| parent | 56269e2db835e50a4cf2681bb73c44ae41fcca10 (diff) | |
| parent | 069af23bdbd2d8b3bca5376c60d654ebf8ec08a3 (diff) | |
Merge pull request #30428 from neikeq/gitcheckout-b
Misc Mono Fixes
Diffstat (limited to 'modules/mono/mono_gd/gd_mono.cpp')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 7ae991eeaa..06fbae019c 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -241,9 +241,9 @@ void GDMono::initialize() { locations.push_back("/usr/local/var/homebrew/linked/mono/"); for (int i = 0; i < locations.size(); i++) { - String hint_assembly_rootdir = path_join(locations[i], "lib"); - String hint_mscorlib_path = path_join(hint_assembly_rootdir, "mono", "4.5", "mscorlib.dll"); - String hint_config_dir = path_join(locations[i], "etc"); + String hint_assembly_rootdir = path::join(locations[i], "lib"); + String hint_mscorlib_path = path::join(hint_assembly_rootdir, "mono", "4.5", "mscorlib.dll"); + String hint_config_dir = path::join(locations[i], "etc"); if (FileAccess::exists(hint_mscorlib_path) && DirAccess::exists(hint_config_dir)) { assembly_rootdir = hint_assembly_rootdir; @@ -564,6 +564,7 @@ bool GDMono::_load_corlib_assembly() { return success; } +#ifdef TOOLS_ENABLED static bool copy_api_assembly(const String &p_src_dir, const String &p_dst_dir, const String &p_assembly_name, APIAssembly::Type p_api_type) { // Create destination directory if needed @@ -607,6 +608,7 @@ static bool copy_api_assembly(const String &p_src_dir, const String &p_dst_dir, return true; } +#endif bool GDMono::_load_core_api_assembly() { |