godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37145 from neikeq/issue-37128 

C#: Fix uses of old Configuration names
This commit is contained in:
Ignacio Roldán Etcheverry 2020-03-18 15:36:12 +01:00 committed by GitHub
parent 4663625d11 66c0b7ce98
commit 97efd33ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/godotsharp_dirs.cpp
View File

@ -49,13 +49,13 @@ namespace GodotSharpDirs {
String _get_expected_build_config() { String _get_expected_build_config() {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
return "Tools"; return "Debug";
#else #else
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
return "Debug"; return "ExportDebug";
#else #else
return "Release"; return "ExportRelease";
#endif #endif
#endif #endif

2
modules/mono/mono_gd/gd_mono_assembly.cpp
View File

@ -78,7 +78,7 @@ void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const Strin
if (p_custom_config.empty()) { if (p_custom_config.empty()) {
r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_dir()); r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_dir());
} else { } else {
String api_config = p_custom_config == "Release" ? "Release" : "Debug"; String api_config = p_custom_config == "ExportRelease" ? "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_base_dir().plus_file(api_config));
} }