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

Fix generating project files for VSCode on Mac without .NET x64 SDK installed

Browse Source
This commit is contained in:
Wojtek Figat
2024-06-28 09:51:29 +02:00
parent dbbc2b70bf
commit 7f482219ef
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Tools/Flax.Build/Build/Builder.Projects.cs
View File

@@ -179,8 +179,7 @@ namespace Flax.Build
using (new ProfileEventScope("GenerateProjects")) using (new ProfileEventScope("GenerateProjects"))
{ {
// Pick the project format // Pick the project format
HashSet<ProjectFormat> projectFormats = new HashSet<ProjectFormat>(); var projectFormats = new HashSet<ProjectFormat>();
if (Configuration.ProjectFormatVS2022) if (Configuration.ProjectFormatVS2022)
projectFormats.Add(ProjectFormat.VisualStudio2022); projectFormats.Add(ProjectFormat.VisualStudio2022);
if (Configuration.ProjectFormatVS2019) if (Configuration.ProjectFormatVS2019)
@@ -195,7 +194,6 @@ namespace Flax.Build
projectFormats.Add(ProjectFormat.VisualStudio2022); projectFormats.Add(ProjectFormat.VisualStudio2022);
if (!string.IsNullOrEmpty(Configuration.ProjectFormatCustom)) if (!string.IsNullOrEmpty(Configuration.ProjectFormatCustom))
projectFormats.Add(ProjectFormat.Custom); projectFormats.Add(ProjectFormat.Custom);
if (projectFormats.Count == 0) if (projectFormats.Count == 0)
projectFormats.Add(Platform.BuildPlatform.DefaultProjectFormat); projectFormats.Add(Platform.BuildPlatform.DefaultProjectFormat);

1
Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
View File

@@ -553,6 +553,7 @@ namespace Flax.Build.Projects.VisualStudioCode
{ {
var toolchain = platform.GetToolchain(architecture); var toolchain = platform.GetToolchain(architecture);
var targetBuildOptions = Builder.GetBuildOptions(target, platform, toolchain, architecture, configuration, Globals.Root); var targetBuildOptions = Builder.GetBuildOptions(target, platform, toolchain, architecture, configuration, Globals.Root);
targetBuildOptions.Flags |= NativeCpp.BuildFlags.GenerateProject;
var modules = Builder.CollectModules(rules, platform, target, targetBuildOptions, toolchain, architecture, configuration); var modules = Builder.CollectModules(rules, platform, target, targetBuildOptions, toolchain, architecture, configuration);
foreach (var module in modules) foreach (var module in modules)
{ {