From ee0c4a97b3423f9fdbc88cc5d7129bab43347775 Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Tue, 8 Jan 2019 01:44:54 +0100 Subject: Use 'release_debug' for mono export templates This fixes the previously wrong PR Because we don't actually ship 'debug' templates to users make sure the mono exporter picks the correct 'data' directory for export templates. This fixes #24752 --- modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs | 2 +- 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 &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); -- cgit v1.2.3