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

removal of old XboxOneStuff

Browse Source
This commit is contained in:
honzapatCZ
2021-07-21 15:10:39 +02:00
parent 36456bfe74
commit c17d86a134
308 changed files with 225 additions and 26405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,13 +65,18 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.UWP:
case TargetPlatform.XboxOne:
{
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 solutionPath = Path.Combine(root, "DirectXTex_GXDK_2017.sln");
File.Copy(Path.Combine(GetBinariesFolder(options, platform), "DirectXTex_GXDK_2017.sln"), solutionPath, true);
var projectFileContents = File.ReadAllText(Path.Combine(GetBinariesFolder(options, platform), "DirectXTex_GXDK_2017.vcxproj"));
projectFileContents = projectFileContents.Replace("___VS_TOOLSET___", "v142");
var projectPath = Path.Combine(root, "DirectXTex", "DirectXTex_GXDK_2017.vcxproj");
File.WriteAllText(projectPath, projectFileContents);
var binFolder = Path.Combine(root, "DirectXTex", "Bin", "GXDK_2017");
Deploy.VCEnvironment.BuildSolution(solutionPath, configuration, "Gaming.Xbox.XboxOne.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));
Utilities.FileCopy(Path.Combine(binFolder, "Gaming.Xbox.XboxOne.x64", configuration, file), Path.Combine(depsFolder, file));
}
break;
}

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

@@ -139,7 +139,6 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Windows:
binariesSubDir = string.Format("win.{0}_{1}.vc140.md", arch, bits);
break;
case TargetPlatform.XboxOne:
case TargetPlatform.UWP:
binariesSubDir = string.Format("uwp.{0}_{1}.vc141", arch, bits);
break;
@@ -153,7 +152,8 @@ namespace Flax.Deps.Dependencies
suppressBitsPostfix = true;
binariesPrefix = "lib";
break;
case TargetPlatform.XboxScarlett:
case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett:
binariesSubDir = "win.x86_64.vc142.md";
break;
case TargetPlatform.Android:
@@ -212,6 +212,7 @@ namespace Flax.Deps.Dependencies
// Hack: PS4 uses .o extension for compiler output files but CMake uses .obj even if CMAKE_CXX_OUTPUT_EXTENSION/CMAKE_C_OUTPUT_EXTENSION are specified
Utilities.ReplaceInFiles(Path.Combine(root, "physx\\compiler\\ps4"), "*.vcxproj", SearchOption.AllDirectories, ".obj", ".o");
break;
case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett:
// Hack: force to use proper Win10 SDK
Utilities.ReplaceInFiles(Path.Combine(root, "physx\\compiler\\vc16win64"), "*.vcxproj", SearchOption.AllDirectories, "10.0.18362.0", "10.0.19041.0");
@@ -335,11 +336,6 @@ namespace Flax.Deps.Dependencies
Build(options, "vc15uwp64", platform, TargetArchitecture.x64);
break;
}
case TargetPlatform.XboxOne:
{
Build(options, "vc15uwp64", platform, TargetArchitecture.x64);
break;
}
case TargetPlatform.Linux:
{
Build(options, "linux", platform, TargetArchitecture.x64);
@@ -356,6 +352,11 @@ namespace Flax.Deps.Dependencies
Build(options, "vc16win64", platform, TargetArchitecture.x64);
break;
}
case TargetPlatform.XboxOne:
{
Build(options, "vc16win64", platform, TargetArchitecture.x64);
break;
}
case TargetPlatform.Android:
{
Build(options, "android", platform, TargetArchitecture.ARM64);

26
Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs
View File

@@ -112,19 +112,6 @@ namespace Flax.Deps.Dependencies
break;
}
case TargetPlatform.XboxOne:
{
// Fix the MSVC project settings for Xbox One
PatchWindowsTargetPlatformVersion(vcxprojPath, vcxprojContents, "10.0.17763.0", "v141");
// Build for Xbox One x64
Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, "x64");
var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64);
foreach (var filename in binariesToCopyMsvc)
Utilities.FileCopy(Path.Combine(root, "objs", "x64", configurationMsvc, filename), Path.Combine(depsFolder, filename));
break;
}
case TargetPlatform.Linux:
{
var envVars = new Dictionary<string, string>
@@ -176,6 +163,19 @@ namespace Flax.Deps.Dependencies
break;
}
case TargetPlatform.XboxOne:
{
// Fix the MSVC project settings for Xbox One
PatchWindowsTargetPlatformVersion(vcxprojPath, vcxprojContents, "10.0.19041.0", "v142");
// Build for Xbox One x64
Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, "x64");
var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64);
foreach (var filename in binariesToCopyMsvc)
Utilities.FileCopy(Path.Combine(root, "objs", "x64", configurationMsvc, filename), Path.Combine(depsFolder, filename));
break;
}
case TargetPlatform.XboxScarlett:
{
// Fix the MSVC project settings for Xbox Scarlett

16
Source/Tools/Flax.Build/Deps/Dependencies/mono.cs
View File

@@ -522,14 +522,6 @@ namespace Flax.Deps.Dependencies
break;
}
case TargetPlatform.XboxOne:
{
ConfigureMsvc(options, "v141", "10.0.17763.0", "0x0A00", "_XBOX_ONE=1;DISABLE_JIT;WINAPI_FAMILY=WINAPI_FAMILY_PC_APP;HAVE_EXTERN_DEFINED_WINAPI_SUPPORT");
BuildMsvc(options, platform, TargetArchitecture.x64);
break;
}
case TargetPlatform.Linux:
{
var envVars = new Dictionary<string, string>
@@ -586,6 +578,14 @@ namespace Flax.Deps.Dependencies
// TODO: implement automatic extraction of the package from mono-ps4-binaries
break;
}
case TargetPlatform.XboxOne:
{
ConfigureMsvc(options, "v142", "10.0.19041.0", "0x0A00", "_XBOX_ONE=1;DISABLE_JIT;WINAPI_FAMILY=WINAPI_FAMILY_GAMES;HAVE_EXTERN_DEFINED_WINAPI_SUPPORT;CRITICAL_SECTION_NO_DEBUG_INFO=0x01000000");
BuildMsvc(options, platform, TargetArchitecture.x64);
break;
}
case TargetPlatform.XboxScarlett:
{
ConfigureMsvc(options, "v142", "10.0.19041.0", "0x0A00", "_XBOX_ONE=1;DISABLE_JIT;WINAPI_FAMILY=WINAPI_FAMILY_GAMES;HAVE_EXTERN_DEFINED_WINAPI_SUPPORT;CRITICAL_SECTION_NO_DEBUG_INFO=0x01000000");

26
Source/Tools/Flax.Build/Deps/Dependencies/ogg.cs
View File

@@ -106,19 +106,6 @@ namespace Flax.Deps.Dependencies
break;
}
case TargetPlatform.XboxOne:
{
// Fix the MSVC project settings for Xbox One
PatchWindowsTargetPlatformVersion(vcxprojPath, vcxprojContents, "10.0.17763.0", "v141");
// Build for Xbox One x64
Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configuration, "x64");
var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64);
foreach (var file in binariesToCopyMsvc)
Utilities.FileCopy(Path.Combine(root, "win32", "VS2015", "x64", configuration, file), Path.Combine(depsFolder, file));
break;
}
case TargetPlatform.Linux:
{
var envVars = new Dictionary<string, string>
@@ -156,6 +143,19 @@ namespace Flax.Deps.Dependencies
break;
}
case TargetPlatform.XboxOne:
{
// Fix the MSVC project settings for Xbox Scarlett
PatchWindowsTargetPlatformVersion(vcxprojPath, vcxprojContents, "10.0.19041.0", "v142");
// Build for Xbox Scarlett x64
Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configuration, "x64");
var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64);
foreach (var file in binariesToCopyMsvc)
Utilities.FileCopy(Path.Combine(root, "win32", "VS2015", "x64", configuration, file), Path.Combine(depsFolder, file));
break;
}
case TargetPlatform.XboxScarlett:
{
// Fix the MSVC project settings for Xbox Scarlett

14
Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs
View File

@@ -147,13 +147,6 @@ namespace Flax.Deps.Dependencies
default: throw new InvalidArchitectureException(architecture);
}
break;
case TargetPlatform.XboxOne:
buildDir = Path.Combine(rootMsvcLib, "win32", "VS2010");
binariesToCopy = binariesToCopyWindows;
vcxprojPaths = vcxprojPathsWindows;
buildPlatform = "x64";
PatchWindowsTargetPlatformVersion("10.0.17763.0", "v141");
break;
case TargetPlatform.UWP:
buildDir = Path.Combine(rootMsvcLib, "win32", "VS2010");
@@ -193,6 +186,13 @@ namespace Flax.Deps.Dependencies
Path.Combine(GetBinariesFolder(options, platform), "Data", "ogg", "ogg", "config_types.h"),
Path.Combine(root, "libogg", "include", "ogg", "config_types.h"));
break;
case TargetPlatform.XboxOne:
buildDir = Path.Combine(rootMsvcLib, "win32", "VS2010");
binariesToCopy = binariesToCopyWindows;
vcxprojPaths = vcxprojPathsWindows;
buildPlatform = "x64";
PatchWindowsTargetPlatformVersion("10.0.19041.0", "v142");
break;
case TargetPlatform.XboxScarlett:
buildDir = Path.Combine(rootMsvcLib, "win32", "VS2010");
binariesToCopy = binariesToCopyWindows;

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

@@ -142,6 +142,7 @@
<Compile Include="Platforms\UWP\*.cs" />
<Compile Include="Platforms\Windows\*.cs" />
<Compile Include="Platforms\XboxOne\*.cs" />
<Compile Include="..\..\Platforms\XboxOne\Flax.Build\*.cs" />
<Compile Include="..\..\Platforms\XboxScarlett\Flax.Build\*.cs" />
<Compile Include="..\..\Platforms\Switch\Flax.Build\*.cs" />
<Compile Include="Projects\IProjectCustomizer.cs" />

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

@@ -56,10 +56,10 @@ namespace Flax.Build.Platforms
switch (platform)
{
case TargetPlatform.Windows: return GetSDKs().Count != 0;
case TargetPlatform.XboxOne:
case TargetPlatform.UWP: return GetSDKs().FirstOrDefault(x => x.Key != WindowsPlatformSDK.v8_1).Value != null;
case TargetPlatform.PS4: return Sdk.HasValid("PS4Sdk");
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;

39
Source/Tools/Flax.Build/Platforms/XboxOne/XboxOnePlatform.cs
View File

@@ -1,39 +0,0 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
using Flax.Build.Projects;
namespace Flax.Build.Platforms
{
/// <summary>
/// The Xbox One platform implementation.
/// </summary>
/// <seealso cref="Platform" />
/// <seealso cref="UWPPlatform" />
public sealed class XboxOnePlatform : UWPPlatform, IProjectCustomizer
{
/// <inheritdoc />
public override TargetPlatform Target => TargetPlatform.XboxOne;
/// <inheritdoc />
public override bool HasSharedLibrarySupport => false;
/// <summary>
/// Initializes a new instance of the <see cref="XboxOnePlatform"/> class.
/// </summary>
public XboxOnePlatform()
{
}
/// <inheritdoc />
protected override Toolchain CreateToolchain(TargetArchitecture architecture)
{
return new XboxOneToolchain(this, architecture);
}
/// <inheritdoc />
void IProjectCustomizer.GetSolutionArchitectureName(TargetArchitecture architecture, ref string name)
{
name = "XboxOne";
}
}
}

36
Source/Tools/Flax.Build/Platforms/XboxOne/XboxOneToolchain.cs
View File

@@ -1,36 +0,0 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
using Flax.Build.NativeCpp;
namespace Flax.Build.Platforms
{
/// <summary>
/// The Xbox One toolchain implementation.
/// </summary>
/// <seealso cref="Toolchain" />
/// <seealso cref="Flax.Build.Platforms.WindowsToolchainBase" />
public sealed class XboxOneToolchain : UWPToolchain
{
/// <summary>
/// Initializes a new instance of the <see cref="XboxOneToolchain"/> class.
/// </summary>
/// <param name="platform">The platform.</param>
/// <param name="architecture">The target architecture.</param>
public XboxOneToolchain(XboxOnePlatform platform, TargetArchitecture architecture)
: base(platform, architecture)
{
}
/// <inheritdoc />
public override void SetupEnvironment(BuildOptions options)
{
base.SetupEnvironment(options);
options.CompileEnv.PreprocessorDefinitions.Add("PLATFORM_XBOX_ONE");
//options.CompileEnv.PreprocessorDefinitions.Add("_XBOX_ONE");
options.CompileEnv.PreprocessorDefinitions.Add("PX_FOUNDATION_DLL=0"); // TODO: let Physics module decide about PhysX deploy mode
options.CompileEnv.PreprocessorDefinitions.Add("WINAPI_FAMILY=WINAPI_FAMILY_PC_APP");
options.CompileEnv.PreprocessorDefinitions.Add("_WINRT_DLL");
}
}
}