diff --git a/Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.cpp b/Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.cpp index b68bc1444..a78a514b4 100644 --- a/Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.cpp +++ b/Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.cpp @@ -146,7 +146,7 @@ bool GDKPlatformTools::OnPostProcess(CookingData& data, GDKPlatformSettings* pla sb.Append(TEXT(" \n")); sb.AppendFormat(TEXT(" ProductName); sb.AppendFormat(TEXT(" PublisherDisplayName=\"{0}\"\n"), platformSettings->PublisherDisplayName.HasChars() ? platformSettings->PublisherDisplayName : gameSettings->CompanyName); - sb.AppendFormat(TEXT(" BackgroundColor=\"#{0}\"\n"), platformSettings->BackgroundColor.ToHexString()); + sb.AppendFormat(TEXT(" BackgroundColor=\"#{0}\"\n"), platformSettings->BackgroundColor.ToHexString().Left(6)); sb.AppendFormat(TEXT(" ForegroundText=\"{0}\"\n"), platformSettings->ForegroundText); sb.Append(TEXT(" Square150x150Logo=\"Assets\\Square150x150Logo.png\"\n")); sb.Append(TEXT(" Square480x480Logo=\"Assets\\Square480x480Logo.png\"\n")); diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GraphicsDeviceDX12.Build.cs b/Source/Engine/GraphicsDevice/DirectX/DX12/GraphicsDeviceDX12.Build.cs index d9cba37ec..e27b65c35 100644 --- a/Source/Engine/GraphicsDevice/DirectX/DX12/GraphicsDeviceDX12.Build.cs +++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GraphicsDeviceDX12.Build.cs @@ -34,7 +34,7 @@ public class GraphicsDeviceDX12 : GraphicsDeviceBaseModule break; } - if (EnableWinPixEventRuntime && options.Configuration != TargetConfiguration.Release) + if (EnableWinPixEventRuntime && options.Configuration != TargetConfiguration.Release && options.Platform.Target == TargetPlatform.Windows) { options.PrivateDefinitions.Add("USE_PIX"); options.PrivateIncludePaths.Add(Path.Combine(Globals.EngineRoot, "Source/ThirdParty/WinPixEventRuntime")); diff --git a/Source/Engine/Video/MF/VideoBackendMF.cpp b/Source/Engine/Video/MF/VideoBackendMF.cpp index 08676e6d8..727a94158 100644 --- a/Source/Engine/Video/MF/VideoBackendMF.cpp +++ b/Source/Engine/Video/MF/VideoBackendMF.cpp @@ -16,7 +16,7 @@ // Fix compilation for Windows 8.1 on the latest Windows SDK typedef enum _MFVideoSphericalFormat { } MFVideoSphericalFormat; #endif -#ifndef MF_SOURCE_READER_CURRENT_TYPE_INDEX +#if !defined(MF_SOURCE_READER_CURRENT_TYPE_INDEX) && !defined(PLATFORM_GDK) // Fix compilation for Windows 7 on the latest Windows SDK #define MF_SOURCE_READER_CURRENT_TYPE_INDEX 0xFFFFFFFF #endif diff --git a/Source/Shaders/Noise.hlsl b/Source/Shaders/Noise.hlsl index 8ba32c34c..59c810d78 100644 --- a/Source/Shaders/Noise.hlsl +++ b/Source/Shaders/Noise.hlsl @@ -85,7 +85,7 @@ float3 rand3dTo3d(float3 value) return float3( rand3dTo1d(value, float3(12.989, 78.233, 37.719)), rand3dTo1d(value, float3(39.346, 11.135, 83.155)), - rand3dTo1d(value, float3(73.156, 52.235, 09.151)) + rand3dTo1d(value, float3(73.156, 52.235, 9.151)) ); } diff --git a/Source/ThirdParty/ogg/config_types.h b/Source/ThirdParty/ogg/config_types.h new file mode 100644 index 000000000..f586c26a0 --- /dev/null +++ b/Source/ThirdParty/ogg/config_types.h @@ -0,0 +1,26 @@ +#ifndef __CONFIG_TYPES_H__ +#define __CONFIG_TYPES_H__ + +/* these are filled in by configure */ +#define INCLUDE_INTTYPES_H 1 +#define INCLUDE_STDINT_H 1 +#define INCLUDE_SYS_TYPES_H 1 + +#if INCLUDE_INTTYPES_H +# include +#endif +#if INCLUDE_STDINT_H +# include +#endif +#if INCLUDE_SYS_TYPES_H +# include +#endif + +typedef int16_t ogg_int16_t; +typedef uint16_t ogg_uint16_t; +typedef int32_t ogg_int32_t; +typedef uint32_t ogg_uint32_t; +typedef int64_t ogg_int64_t; +typedef uint64_t ogg_uint64_t; + +#endif diff --git a/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs b/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs index c8e0dff11..d8f9cf9dc 100644 --- a/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs +++ b/Source/Tools/Flax.Build/Platforms/GDK/GDKToolchain.cs @@ -55,7 +55,8 @@ namespace Flax.Build.Platforms var paths = Directory.GetDirectories(redistToolsPath, name.Substring(0, 2) + "*"); if (paths.Length == 0) throw new Exception($"Failed to find MSVC redistribute binaries for toolset '{Toolset}' inside folder '{toolsPath}'"); - redistToolsPath = Path.Combine(paths[0], "x64", "Microsoft.VC" + (int)Toolset + ".CRT"); + var crtToolset = Toolset > WindowsPlatformToolset.v143 ? WindowsPlatformToolset.v143 : Toolset; + redistToolsPath = Path.Combine(paths[0], "x64", "Microsoft.VC" + (int)crtToolset + ".CRT"); redistToolsPath = Utilities.RemovePathRelativeParts(redistToolsPath); options.DependencyFiles.Add(Path.Combine(redistToolsPath, "concrt140.dll")); options.DependencyFiles.Add(Path.Combine(redistToolsPath, "msvcp140.dll"));