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

Merge pull request #72896 from RedworkDE/net-include-scripts-export-option

Browse Source
This commit is contained in:
Yuri Sizov 2023-04-18 18:32:01 +02:00 committed by GitHub
commit 06f5b09ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
View File

@ -21,10 +21,22 @@ namespace GodotTools.Export
private List<string> _tempFolders = new List<string>();
public void RegisterExportSettings()
public override Godot.Collections.Array<Godot.Collections.Dictionary> _GetExportOptions(EditorExportPlatform platform)
{
// TODO: These would be better as export preset options, but that doesn't seem to be supported yet
GlobalDef("dotnet/export/include_scripts_content", false);
return new Godot.Collections.Array<Godot.Collections.Dictionary>()
{
new Godot.Collections.Dictionary()
{
{
"option", new Godot.Collections.Dictionary()
{
{ "name", "dotnet/include_scripts_content" },
{ "type", (int)Variant.Type.Bool }
}
},
{ "default_value", false }
}
};
}
private string _maybeLastExportError;
@ -44,7 +56,7 @@ namespace GodotTools.Export
// TODO What if the source file is not part of the game's C# project
bool includeScriptsContent = (bool)ProjectSettings.GetSetting("dotnet/export/include_scripts_content");
bool includeScriptsContent = (bool)GetOption("dotnet/include_scripts_content");
if (!includeScriptsContent)
{

1
modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
View File

@ -594,7 +594,6 @@ namespace GodotTools
// Export plugin
var exportPlugin = new ExportPlugin();
AddExportPlugin(exportPlugin);
exportPlugin.RegisterExportSettings();
_exportPluginWeak = WeakRef(exportPlugin);
BuildManager.Initialize();