diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2019-01-08 01:48:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 01:48:12 +0100 |
| commit | f7de2c0cb3793bd289b8465bcc9af54157a54e91 (patch) | |
| tree | 72109a76003f4349d962a270b5c8ec9d2b632283 /modules | |
| parent | e4b02513fe4e352c4ba74fc28b306e83b7014083 (diff) | |
| parent | ee0c4a97b3423f9fdbc88cc5d7129bab43347775 (diff) | |
Merge pull request #24830 from hpvb/fix-24752v2
Use 'release_debug' for mono export templates
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs | 2 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_export.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs b/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs index 5fd708d539..e45dd2025b 100644 --- a/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs +++ b/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs @@ -30,7 +30,7 @@ namespace GodotSharpTools.Editor throw new NotSupportedException("Target platform not supported"); } - templateDirName += debug ? ".debug" : ".release"; + templateDirName += debug ? ".release_debug" : ".release"; string templateDirPath = Path.Combine(GetTemplatesDir(), templateDirName); diff --git a/modules/mono/editor/godotsharp_export.cpp b/modules/mono/editor/godotsharp_export.cpp index 151a61d2b0..85a1785e87 100644 --- a/modules/mono/editor/godotsharp_export.cpp +++ b/modules/mono/editor/godotsharp_export.cpp @@ -87,7 +87,7 @@ void GodotSharpExport::_export_begin(const Set<String> &p_features, bool p_debug String build_config = p_debug ? "Debug" : "Release"; - String scripts_metadata_path = GodotSharpDirs::get_res_metadata_dir().plus_file("scripts_metadata." + String(p_debug ? "release_debug" : "release")); + String scripts_metadata_path = GodotSharpDirs::get_res_metadata_dir().plus_file("scripts_metadata." + String(p_debug ? "debug" : "release")); Error metadata_err = CSharpProject::generate_scripts_metadata(GodotSharpDirs::get_project_csproj_path(), scripts_metadata_path); ERR_FAIL_COND(metadata_err != OK); |