GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix VS build issues with C# projects when engine path has spaces

Browse Source
This commit is contained in:
Ari Vuollet
2023-12-16 14:45:28 +02:00
parent 9c4857a205
commit d614232f8d
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
View File

@@ -702,7 +702,7 @@ namespace Flax.Build.Projects.VisualStudio
// Override MSBuild build tasks to run Flax.Build in C#-only projects // Override MSBuild build tasks to run Flax.Build in C#-only projects
{ {
// Build command for the build tool // Build command for the build tool
var buildToolPath = Path.ChangeExtension(Utilities.MakePathRelativeTo(typeof(Builder).Assembly.Location, Path.GetDirectoryName(solution.MainProject.Path)), null); var buildToolPath = Path.ChangeExtension(typeof(Builder).Assembly.Location, null);
var targetsFileContent = new StringBuilder(); var targetsFileContent = new StringBuilder();
targetsFileContent.AppendLine("<Project>"); targetsFileContent.AppendLine("<Project>");
@@ -724,16 +724,16 @@ namespace Flax.Build.Projects.VisualStudio
{ {
foreach (var configuration in solution.MainProject.Configurations) foreach (var configuration in solution.MainProject.Configurations)
{ {
var cmdLine = string.Format("{0} -log -mutex -workspace={1} -arch={2} -configuration={3} -platform={4} -buildTargets={5}", var cmdLine = string.Format("\"{0}\" -log -mutex -workspace=\"{1}\" -arch={2} -configuration={3} -platform={4} -buildTargets={5}",
FixPath(buildToolPath), buildToolPath,
FixPath(solution.MainProject.WorkspaceRootPath), solution.MainProject.WorkspaceRootPath,
configuration.Architecture, configuration.Architecture,
configuration.Configuration, configuration.Configuration,
configuration.Platform, configuration.Platform,
configuration.Target); configuration.Target);
Configuration.PassArgs(ref cmdLine); Configuration.PassArgs(ref cmdLine);
str.AppendLine(string.Format(" <Exec Command=\"{0} {1}\" Condition=\"'$(Configuration)|$(Platform)'=='{2}'\"/>", cmdLine, extraArgs, configuration.Name)); str.AppendLine(string.Format(" <Exec Command='{0} {1}' Condition=\"'$(Configuration)|$(Platform)'=='{2}'\"/>", cmdLine, extraArgs, configuration.Name));
} }
} }
} }
@@ -774,14 +774,5 @@ namespace Flax.Build.Projects.VisualStudio
projects.Add(project); projects.Add(project);
} }
} }
private static string FixPath(string path)
{
if (path.Contains(' '))
{
path = "\"" + path + "\"";
}
return path;
}
} }
} }