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

Add curl lib linking in GDK and expose XboxServicesToolset for plugins/modules

Browse Source
This commit is contained in:
Wojtek Figat
2025-03-25 13:23:23 +01:00
parent 1b3ad99554
commit 4e14035281
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs
View File

@@ -13,6 +13,11 @@ namespace Flax.Build.Platforms
/// <seealso cref="Flax.Build.Platforms.WindowsToolchainBase" /> /// <seealso cref="Flax.Build.Platforms.WindowsToolchainBase" />
public abstract class GDKToolchain : WindowsToolchainBase public abstract class GDKToolchain : WindowsToolchainBase
{ {
/// <summary>
/// Gets the version of Xbox Services toolset.
/// </summary>
public WindowsPlatformToolset XboxServicesToolset => Toolset > WindowsPlatformToolset.v142 ? WindowsPlatformToolset.v142 : Toolset;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="GDKToolchain"/> class. /// Initializes a new instance of the <see cref="GDKToolchain"/> class.
/// </summary> /// </summary>
@@ -26,9 +31,12 @@ namespace Flax.Build.Platforms
SystemIncludePaths.Add(Path.Combine(GDK.Instance.RootPath, "GRDK\\GameKit\\Include")); SystemIncludePaths.Add(Path.Combine(GDK.Instance.RootPath, "GRDK\\GameKit\\Include"));
SystemLibraryPaths.Add(Path.Combine(GDK.Instance.RootPath, "GRDK\\GameKit\\Lib\\amd64")); SystemLibraryPaths.Add(Path.Combine(GDK.Instance.RootPath, "GRDK\\GameKit\\Lib\\amd64"));
var xboxServicesPath = Path.Combine(GDK.Instance.RootPath, "GRDK\\ExtensionLibraries\\Xbox.Services.API.C\\DesignTime\\CommonConfiguration\\Neutral\\"); var xboxServicesPath = Path.Combine(GDK.Instance.RootPath, "GRDK\\ExtensionLibraries\\Xbox.Services.API.C\\DesignTime\\CommonConfiguration\\Neutral\\");
var xboxServicesToolset = Toolset > WindowsPlatformToolset.v142 ? WindowsPlatformToolset.v142 : Toolset; var xboxServicesToolset = XboxServicesToolset;
SystemIncludePaths.Add(xboxServicesPath + "Include"); SystemIncludePaths.Add(xboxServicesPath + "Include");
SystemLibraryPaths.Add(xboxServicesPath + "Lib\\Release\\" + xboxServicesToolset); SystemLibraryPaths.Add(xboxServicesPath + "Lib\\Release\\" + xboxServicesToolset);
var curlPath = Path.Combine(GDK.Instance.RootPath, "GRDK\\ExtensionLibraries\\Xbox.XCurl.API\\DesignTime\\CommonConfiguration\\Neutral\\");
SystemIncludePaths.Add(curlPath + "Include");
SystemLibraryPaths.Add(curlPath + "Lib");
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -43,7 +51,7 @@ namespace Flax.Build.Platforms
options.LinkEnv.InputLibraries.Add("xgameruntime.lib"); options.LinkEnv.InputLibraries.Add("xgameruntime.lib");
options.LinkEnv.InputLibraries.Add("xgameplatform.lib"); options.LinkEnv.InputLibraries.Add("xgameplatform.lib");
var xboxServicesToolset = Toolset > WindowsPlatformToolset.v142 ? WindowsPlatformToolset.v142 : Toolset; var xboxServicesToolset = XboxServicesToolset;
options.LinkEnv.InputLibraries.Add($"Microsoft.Xbox.Services.{(int)xboxServicesToolset}.GDK.C.lib"); options.LinkEnv.InputLibraries.Add($"Microsoft.Xbox.Services.{(int)xboxServicesToolset}.GDK.C.lib");
var toolsetPath = WindowsPlatformBase.GetToolsets()[Toolset]; var toolsetPath = WindowsPlatformBase.GetToolsets()[Toolset];