diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-27 11:08:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 11:08:17 +0100 |
| commit | 75c7e66c5ed66e3832b2c94a8b809ab97b85922a (patch) | |
| tree | dd8168e92eb129ad6b99451ab302de2cac16c0b6 /modules/mono/mono_gd | |
| parent | 4972269c86c8aa4e5e948aada01c33e66de87415 (diff) | |
| parent | a45697d8dfb3b8e6fb7817060d52b22802a7d45f (diff) | |
Merge pull request #15641 from neikeq/mono-is-picky-regarding-corlib-so-we-must-make-sure-to-ship-the-right-version-otherwise-something-bad-may-happen
Mono: Buildsystem improvements
Diffstat (limited to 'modules/mono/mono_gd')
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index e0743346aa..2ce1b0a9df 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -116,6 +116,9 @@ MonoAssembly *GDMonoAssembly::_preload_hook(MonoAssemblyName *aname, char **asse search_dirs.push_back(GodotSharpDirs::get_res_assemblies_dir()); search_dirs.push_back(OS::get_singleton()->get_resource_dir()); search_dirs.push_back(OS::get_singleton()->get_executable_path().get_base_dir()); +#ifdef GD_MONO_EDITOR_ASSEMBLIES_DIR + search_dirs.push_back(OS::get_singleton()->get_executable_path().get_base_dir().plus_file(_MKSTR(GD_MONO_EDITOR_ASSEMBLIES_DIR)).simplify_path()); +#endif const char *rootdir = mono_assembly_getrootdir(); if (rootdir) { |