diff --git a/Source/Editor/Editor.cs b/Source/Editor/Editor.cs index 7e624efd3..9d7a1484e 100644 --- a/Source/Editor/Editor.cs +++ b/Source/Editor/Editor.cs @@ -740,7 +740,7 @@ namespace FlaxEditor var procSettings = new CreateProcessSettings { FileName = Platform.ExecutableFilePath, - Arguments = string.Format("-project \"{0}\"" + (_projectIsNew ? " -new" : string.Empty), _projectToOpen), + Arguments = string.Format("-project=\"{0}\"" + (_projectIsNew ? " -new" : string.Empty), _projectToOpen), ShellExecute = true, WaitForEnd = false, HiddenWindow = false, diff --git a/Source/Editor/Windows/SplashScreen.cpp b/Source/Editor/Windows/SplashScreen.cpp index 86c695d6f..85a09f849 100644 --- a/Source/Editor/Windows/SplashScreen.cpp +++ b/Source/Editor/Windows/SplashScreen.cpp @@ -29,7 +29,7 @@ const Char* SplashScreenQuotes[] = #elif PLATFORM_LINUX TEXT("Try it on a Raspberry"), TEXT("Trying to exit vim"), - TEXT("sudo flax --project HelloWorld.flaxproj"), + TEXT("sudo flax --project=HelloWorld.flaxproj"), #elif PLATFORM_MAC TEXT("don't compare Macbooks to oranges."), TEXT("Why does macbook heat up?\nBecause it doesn't have windows"), diff --git a/Source/Engine/Engine/CommandLine.h b/Source/Engine/Engine/CommandLine.h index 79c9c30ae..8a1f740a1 100644 --- a/Source/Engine/Engine/CommandLine.h +++ b/Source/Engine/Engine/CommandLine.h @@ -124,7 +124,7 @@ public: #if USE_EDITOR /// - /// -project !path! (Startup project path) + /// -project= (Startup project path) /// String Project; @@ -154,7 +154,7 @@ public: Nullable ClearCookerCache; /// - /// The build preset (-build !preset.target! or -build !preset!) (run game building on startup and exit app on end). + /// The build preset (-build= or -build=) (run game building on startup and exit app on end). /// Nullable Build; @@ -174,7 +174,7 @@ public: Nullable Exit; /// - /// -play !guid! ( Scene to play, can be empty to use default ) + /// -play= ( Scene to play, can be empty to use default ) /// Nullable Play; #endif diff --git a/Source/Tools/Flax.Build/Projects/CMake/CMakeProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/CMake/CMakeProjectGenerator.cs index da68565fb..4f32e1080 100644 --- a/Source/Tools/Flax.Build/Projects/CMake/CMakeProjectGenerator.cs +++ b/Source/Tools/Flax.Build/Projects/CMake/CMakeProjectGenerator.cs @@ -439,8 +439,7 @@ namespace Flax.Build.Projects.CMake var args = new List(); if (configuration.Platform == TargetPlatform.Linux || configuration.Platform == TargetPlatform.Mac) args.Add("-std"); - args.Add("-project"); - args.Add(project.WorkspaceRootPath); + args.Add($"-project=\"{project.WorkspaceRootPath}\""); args.Add("-skipCompile"); arguments = args.ToArray(); return program; diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs index a4d772e0d..0ed967c6c 100644 --- a/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs +++ b/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs @@ -401,7 +401,7 @@ namespace Flax.Build.Projects.VisualStudio cppTargetsFileContent.AppendLine(" $(RootNamespace)$(Configuration.Split('.')[0])"); cppTargetsFileContent.AppendLine(" $(OutDir)/$(TargetName)$(TargetExt)"); if (!string.IsNullOrEmpty(debuggerProjectPath)) - cppTargetsFileContent.AppendLine(string.Format(" -project \"{0}\"", debuggerProjectPath)); + cppTargetsFileContent.AppendLine(string.Format(" -project=\"{0}\"", debuggerProjectPath)); else cppTargetsFileContent.AppendLine(" "); cppTargetsFileContent.AppendLine(string.Format(" {0}", editorPath)); diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs index d866448b2..21736633f 100644 --- a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs +++ b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs @@ -635,7 +635,7 @@ namespace Flax.Build.Projects.VisualStudio var configuration = "$(FlaxConfiguration)"; var editorPath = Utilities.NormalizePath(Path.Combine(Globals.EngineRoot, Platform.GetEditorBinaryDirectory(), configuration, $"FlaxEditor{Utilities.GetPlatformExecutableExt()}")).Replace('\\', '/'); var workspacePath = Utilities.NormalizePath(solutionDirectory).Replace('\\', '/'); - var args = Globals.Project.Name == "Flax" ? "" : $"-project \\\"{workspacePath}\\\""; + var args = Globals.Project.Name == "Flax" ? "" : $"-project=\\\"{workspacePath}\\\""; foreach (var project in projects) { if (project.Type == TargetType.DotNetCore) diff --git a/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs index d3f5faca4..82407f1ea 100644 --- a/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs +++ b/Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs @@ -344,8 +344,7 @@ namespace Flax.Build.Projects.VisualStudioCode { if (configuration.Platform == TargetPlatform.Linux || configuration.Platform == TargetPlatform.Mac) json.AddUnnamedField("-std"); - json.AddUnnamedField("-project"); - json.AddUnnamedField(buildToolWorkspace); + json.AddUnnamedField($"-project=\"{buildToolWorkspace}\""); json.AddUnnamedField("-skipCompile"); if (hasMonoProjects) { @@ -399,8 +398,7 @@ namespace Flax.Build.Projects.VisualStudioCode { if (configuration.Platform == TargetPlatform.Linux || configuration.Platform == TargetPlatform.Mac) json.AddUnnamedField("-std"); - json.AddUnnamedField("-project"); - json.AddUnnamedField(buildToolWorkspace); + json.AddUnnamedField($"-project=\"{buildToolWorkspace}\""); json.AddUnnamedField("-skipCompile"); } json.EndArray();