Add support for including global configs in engine configuration options

This commit is contained in:
Wojtek Figat
2023-11-25 18:08:34 +01:00
parent 9e74f3ae22
commit 71f30f18a6

View File

@@ -82,7 +82,10 @@ namespace Flax.Build
{ {
var engineProject = EngineTarget.EngineProject; var engineProject = EngineTarget.EngineProject;
if (engineProject != null && engineProject.Configuration != null && engineProject.Configuration.Count != 0) if (engineProject != null && engineProject.Configuration != null && engineProject.Configuration.Count != 0)
{
CommandLine.Configure(typeof(EngineConfiguration), engineProject.Configuration); CommandLine.Configure(typeof(EngineConfiguration), engineProject.Configuration);
CommandLine.Configure(typeof(Configuration), engineProject.Configuration);
}
CommandLine.Configure(typeof(EngineConfiguration)); CommandLine.Configure(typeof(EngineConfiguration));
} }
@@ -90,7 +93,6 @@ namespace Flax.Build
if (Configuration.Mutex) if (Configuration.Mutex)
{ {
singleInstanceMutex = new Mutex(true, "Flax.Build", out var oneInstanceMutexCreated); singleInstanceMutex = new Mutex(true, "Flax.Build", out var oneInstanceMutexCreated);
if (!oneInstanceMutexCreated) if (!oneInstanceMutexCreated)
{ {
try try