diff --git a/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs b/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs index d8f9cf9dc..10a20bd95 100644 --- a/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs +++ b/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs @@ -13,6 +13,11 @@ namespace Flax.Build.Platforms /// public abstract class GDKToolchain : WindowsToolchainBase { + /// + /// Gets the version of Xbox Services toolset. + /// + public WindowsPlatformToolset XboxServicesToolset => Toolset > WindowsPlatformToolset.v142 ? WindowsPlatformToolset.v142 : Toolset; + /// /// Initializes a new instance of the class. /// @@ -26,9 +31,12 @@ namespace Flax.Build.Platforms SystemIncludePaths.Add(Path.Combine(GDK.Instance.RootPath, "GRDK\\GameKit\\Include")); 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 xboxServicesToolset = Toolset > WindowsPlatformToolset.v142 ? WindowsPlatformToolset.v142 : Toolset; + var xboxServicesToolset = XboxServicesToolset; SystemIncludePaths.Add(xboxServicesPath + "Include"); 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"); } /// @@ -43,7 +51,7 @@ namespace Flax.Build.Platforms options.LinkEnv.InputLibraries.Add("xgameruntime.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"); var toolsetPath = WindowsPlatformBase.GetToolsets()[Toolset];