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

Post merge fixes and cleanup

Browse Source 
#571
This commit is contained in:
Wojtek Figat
2021-08-26 17:27:38 +02:00
parent 87a08a7db6
commit d9410f9cdd
14 changed files with 59 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Tools/Flax.Build/Deps/Dependencies/DirectXTex.cs
View File

@@ -63,6 +63,17 @@ namespace Flax.Deps.Dependencies
break;
}
case TargetPlatform.UWP:
{
var solutionPath = Path.Combine(root, "DirectXTex_Windows10_2017.sln");
var binFolder = Path.Combine(root, "DirectXTex", "Bin", "Windows10_2017");
Deploy.VCEnvironment.BuildSolution(solutionPath, configuration, "x64");
var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64);
foreach (var file in outputFileNames)
{
Utilities.FileCopy(Path.Combine(binFolder, "x64", configuration, file), Path.Combine(depsFolder, file));
}
break;
}
case TargetPlatform.XboxOne:
{
var solutionPath = Path.Combine(root, "DirectXTex_GXDK_2017.sln");

4
Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
View File

@@ -152,8 +152,8 @@ namespace Flax.Deps.Dependencies
suppressBitsPostfix = true;
binariesPrefix = "lib";
break;
case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett:
case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett:
binariesSubDir = "win.x86_64.vc142.md";
break;
case TargetPlatform.Android:

2
Source/Tools/Flax.Build/Flax.Build.csproj
View File

@@ -141,7 +141,7 @@
<Compile Include="Platforms\Unix\*.cs" />
<Compile Include="Platforms\UWP\*.cs" />
<Compile Include="Platforms\Windows\*.cs" />
<Compile Include="Platforms\XboxOne\*.cs" />
<Compile Include="Platforms\GDK\*.cs" />
<Compile Include="..\..\Platforms\XboxOne\Flax.Build\*.cs" />
<Compile Include="..\..\Platforms\XboxScarlett\Flax.Build\*.cs" />
<Compile Include="..\..\Platforms\Switch\Flax.Build\*.cs" />

4
Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatform.cs
View File

@@ -58,8 +58,8 @@ namespace Flax.Build.Platforms
case TargetPlatform.Windows: return GetSDKs().Count != 0;
case TargetPlatform.UWP: return GetSDKs().FirstOrDefault(x => x.Key != WindowsPlatformSDK.v8_1).Value != null;
case TargetPlatform.PS4: return Sdk.HasValid("PS4Sdk");
case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett: return GetSDKs().ContainsKey(WindowsPlatformSDK.v10_0_19041_0) && Sdk.HasValid("GDK");
case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett: return GetSDKs().ContainsKey(WindowsPlatformSDK.v10_0_19041_0) && Sdk.HasValid("GDK");
case TargetPlatform.Android: return AndroidSdk.Instance.IsValid && AndroidNdk.Instance.IsValid;
case TargetPlatform.Switch: return Sdk.HasValid("SwitchSdk");
default: return false;