diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs index 617c1c3de..e86f5cf42 100644 --- a/Source/Editor/Options/InterfaceOptions.cs +++ b/Source/Editor/Options/InterfaceOptions.cs @@ -420,6 +420,12 @@ namespace FlaxEditor.Options [DefaultValue(1), Range(1, 4)] [EditorDisplay("Cook & Run"), EditorOrder(600)] public int NumberOfGameClientsToLaunch = 1; + + /// + /// Gets or sets the build configuration to use when using Cook and Run option in the editor. + /// + [EditorDisplay("Cook & Run"), EditorOrder(601), ExpandGroups, Tooltip("The build configuration to use when using Cook and Run option in the editor.")] + public BuildConfiguration CookAndRunBuildConfiguration { get; set; } = BuildConfiguration.Development; /// /// Gets or sets the curvature of the line connecting to connected visject nodes. diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs index 54aec19ab..01c482c19 100644 --- a/Source/Editor/Windows/GameCookerWindow.cs +++ b/Source/Editor/Windows/GameCookerWindow.cs @@ -974,8 +974,9 @@ namespace FlaxEditor.Windows public void BuildAndRun() { Editor.Log("Building and running"); - GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration); + GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out _); var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch; + var buildConfig = Editor.Options.Options.Interface.CookAndRunBuildConfiguration; for (int i = 0; i < numberOfClients; i++) { var buildOptions = BuildOptions.AutoRun; @@ -988,7 +989,7 @@ namespace FlaxEditor.Windows { Output = _buildTabProxy.PerPlatformOptions[platform].Output, Platform = buildPlatform, - Mode = buildConfiguration, + Mode = buildConfig, }, Options = buildOptions, }); @@ -1001,8 +1002,9 @@ namespace FlaxEditor.Windows public void RunCooked() { Editor.Log("Running cooked build"); - GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration); + GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out _); var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch; + var buildConfig = Editor.Options.Options.Interface.CookAndRunBuildConfiguration; for (int i = 0; i < numberOfClients; i++) { _buildingQueue.Enqueue(new QueueItem @@ -1011,7 +1013,7 @@ namespace FlaxEditor.Windows { Output = _buildTabProxy.PerPlatformOptions[platform].Output, Platform = buildPlatform, - Mode = buildConfiguration, + Mode = buildConfig, }, Options = BuildOptions.AutoRun | BuildOptions.NoCook, });