diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-03 18:06:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 18:06:07 +0200 |
| commit | 42569f566f7750e355bf07f15008b54677043536 (patch) | |
| tree | 1f896d45a14d5a7c777d45b02ad7ca780cc30cd7 /modules/mono/mono_gd/gd_mono_assembly.cpp | |
| parent | 22583ec6a39bb56943c78c0ed9a094b28b666b75 (diff) | |
| parent | 14df9e5cb2e9f2de4adf9b979e8ef33de37b80bd (diff) | |
Merge pull request #29359 from neikeq/android-mono
Android build and export for the mono module
Diffstat (limited to 'modules/mono/mono_gd/gd_mono_assembly.cpp')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index 8fec28b186..f1f0015ac9 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -46,11 +46,17 @@ bool GDMonoAssembly::in_preload = false; Vector<String> GDMonoAssembly::search_dirs; -void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const String &p_custom_config) { +void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const String &p_custom_config, const String &p_custom_bcl_dir) { - const char *rootdir = mono_assembly_getrootdir(); - if (rootdir) { - String framework_dir = String::utf8(rootdir).plus_file("mono").plus_file("4.5"); + String framework_dir; + + if (!p_custom_bcl_dir.empty()) { + framework_dir = p_custom_bcl_dir; + } else if (mono_assembly_getrootdir()) { + framework_dir = String::utf8(mono_assembly_getrootdir()).plus_file("mono").plus_file("4.5"); + } + + if (!framework_dir.empty()) { r_search_dirs.push_back(framework_dir); r_search_dirs.push_back(framework_dir.plus_file("Facades")); } |