diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2020-03-18 15:36:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 15:36:12 +0100 |
| commit | 97efd33adabdcaa6dea20cedd60f9efd1bce9a5f (patch) | |
| tree | 03393b5ab41c34d45a375e3b9437b048c8b4bd8d | |
| parent | 4663625d11899a0744b0bbfd7e5b06ecb4e3e8ae (diff) | |
| parent | 66c0b7ce98173a06b367fea85ef0ac93065f8fd5 (diff) | |
Merge pull request #37145 from neikeq/issue-37128
C#: Fix uses of old Configuration names
| -rw-r--r-- | modules/mono/godotsharp_dirs.cpp | 6 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp index 47eb432490..828ab73c82 100644 --- a/modules/mono/godotsharp_dirs.cpp +++ b/modules/mono/godotsharp_dirs.cpp @@ -49,13 +49,13 @@ namespace GodotSharpDirs { String _get_expected_build_config() { #ifdef TOOLS_ENABLED - return "Tools"; + return "Debug"; #else #ifdef DEBUG_ENABLED - return "Debug"; + return "ExportDebug"; #else - return "Release"; + return "ExportRelease"; #endif #endif diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index 57b7653a00..6da1db249c 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -78,7 +78,7 @@ void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const Strin if (p_custom_config.empty()) { r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_dir()); } 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)); } |