godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Use 'release_debug' for mono export templates

Browse Source 
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
This commit is contained in:
Hein-Pieter van Braam
2019-01-08 01:44:54 +01:00
parent f8eaa2fc59
commit ee0c4a97b3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs
View File

@@ -30,7 +30,7 @@ namespace GodotSharpTools.Editor
throw new NotSupportedException("Target platform not supported"); throw new NotSupportedException("Target platform not supported");
} }
templateDirName += debug ? ".debug" : ".release"; templateDirName += debug ? ".release_debug" : ".release";
string templateDirPath = Path.Combine(GetTemplatesDir(), templateDirName); string templateDirPath = Path.Combine(GetTemplatesDir(), templateDirName);

2
modules/mono/editor/godotsharp_export.cpp
View File

@@ -87,7 +87,7 @@ void GodotSharpExport::_export_begin(const Set<String> &p_features, bool p_debug
String build_config = p_debug ? "Debug" : "Release"; 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); Error metadata_err = CSharpProject::generate_scripts_metadata(GodotSharpDirs::get_project_csproj_path(), scripts_metadata_path);
ERR_FAIL_COND(metadata_err != OK); ERR_FAIL_COND(metadata_err != OK);