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

Various fixes after merge with Windows ARM pr

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-25 08:34:51 +02:00
parent 51f30958cd
commit f21b259376
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/GraphicsDevice/DirectX/DX12/GraphicsDeviceDX12.Build.cs
View File

@@ -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"));

2
Source/Engine/Video/MF/VideoBackendMF.cpp
View File

@@ -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