asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #30463 from neikeq/fix-search-dirs

Browse source 
Fix export templates ignoring assemblies in 'res://.mono/assemblies'
This commit is contained in:
Rémi Verschelde 2019-07-09 21:59:32 +02:00 • committed by GitHub
commit d2e620b8fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/mono/build_scripts/solution_builder.py
View file

@ -112,6 +112,11 @@ def find_msbuild_windows(env):
mono_bin_dir = os.path.join(mono_root, 'bin') mono_bin_dir = os.path.join(mono_root, 'bin')
msbuild_mono = os.path.join(mono_bin_dir, 'msbuild.bat') msbuild_mono = os.path.join(mono_bin_dir, 'msbuild.bat')
msbuild_tools_path = find_msbuild_tools_path_reg()
if msbuild_tools_path:
return (os.path.join(msbuild_tools_path, 'MSBuild.exe'), framework_path, {})
if os.path.isfile(msbuild_mono): if os.path.isfile(msbuild_mono):
# The (Csc/Vbc/Fsc)ToolExe environment variables are required when # The (Csc/Vbc/Fsc)ToolExe environment variables are required when
# building with Mono's MSBuild. They must point to the batch files # building with Mono's MSBuild. They must point to the batch files
@ -123,11 +128,6 @@ def find_msbuild_windows(env):
} }
return (msbuild_mono, framework_path, mono_msbuild_env) return (msbuild_mono, framework_path, mono_msbuild_env)
msbuild_tools_path = find_msbuild_tools_path_reg()
if msbuild_tools_path:
return (os.path.join(msbuild_tools_path, 'MSBuild.exe'), framework_path, {})
return None return None

25
modules/mono/mono_gd/gd_mono_assembly.cpp
View file

@ -46,20 +46,6 @@ bool GDMonoAssembly::in_preload = false;
Vector<String> GDMonoAssembly::search_dirs; Vector<String> GDMonoAssembly::search_dirs;
static String _get_expected_api_build_config() {
#ifdef TOOLS_ENABLED
return "Debug";
#else
#ifdef DEBUG_ENABLED
return "Debug";
#else
return "Release";
#endif
#endif
}
void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const String &p_custom_config, const String &p_custom_bcl_dir) { void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const String &p_custom_config, const String &p_custom_bcl_dir) {
String framework_dir; String framework_dir;
@ -81,11 +67,14 @@ void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const Strin
r_search_dirs.push_back(GodotSharpDirs::get_res_temp_assemblies_dir()); r_search_dirs.push_back(GodotSharpDirs::get_res_temp_assemblies_dir());
} }
String api_config = p_custom_config.empty() ? _get_expected_api_build_config() : if (p_custom_config.empty()) {
(p_custom_config == "Release" ? "Release" : "Debug"); r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_dir());
r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_base_dir().plus_file(api_config)); } else {
String api_config = p_custom_config == "Release" ? "Release" : "Debug";
r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_base_dir().plus_file(api_config));
}
r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_dir()); r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_base_dir());
r_search_dirs.push_back(OS::get_singleton()->get_resource_dir()); r_search_dirs.push_back(OS::get_singleton()->get_resource_dir());
r_search_dirs.push_back(OS::get_singleton()->get_executable_path().get_base_dir()); r_search_dirs.push_back(OS::get_singleton()->get_executable_path().get_base_dir());