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

Fix code style

Browse Source
This commit is contained in:
Wojtek Figat
2020-12-30 11:20:37 +01:00
parent 4ec3e6aed9
commit 4c205be617
56 changed files with 608 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs
View File

@@ -406,14 +406,13 @@ namespace Flax.Build.Platforms
case WindowsPlatformToolset.v142:
{
/*
// Use the x86-on-x64 compiler
string crossCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX64", "x86", "cl.exe");
if (File.Exists(crossCompilerPath))
{
return Path.GetDirectoryName(crossCompilerPath);
}
*/
// Otherwise the native 32-bit compiler if present
string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX86", "x86", "cl.exe");
if (File.Exists(nativeCompilerPath))
{
@@ -442,14 +441,12 @@ namespace Flax.Build.Platforms
{
case WindowsPlatformToolset.v140:
{
// Use the native 64-bit compiler if present
string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", "amd64", "cl.exe");
if (File.Exists(nativeCompilerPath))
{
return Path.GetDirectoryName(nativeCompilerPath);
}
// Otherwise use the x64-on-x86 compiler
string crossCompilerPath = Path.Combine(vcToolChainDir, "bin", "x86_amd64", "cl.exe");
if (File.Exists(crossCompilerPath))
{
@@ -462,14 +459,12 @@ namespace Flax.Build.Platforms
case WindowsPlatformToolset.v141:
case WindowsPlatformToolset.v142:
{
// Use the native 64-bit compiler if present
string nativeCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX64", "x64", "cl.exe");
if (File.Exists(nativeCompilerPath))
{
return Path.GetDirectoryName(nativeCompilerPath);
}
// Otherwise try the x64-on-x86 compiler
string crossCompilerPath = Path.Combine(vcToolChainDir, "bin", "HostX86", "x64", "cl.exe");
if (File.Exists(crossCompilerPath))
{
@@ -488,6 +483,7 @@ namespace Flax.Build.Platforms
{
}
/// <inheritdoc />
void IProjectCustomizer.GetProjectArchitectureName(Project project, Platform platform, TargetArchitecture architecture, ref string name)
{
if (architecture == TargetArchitecture.x86)