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

Update minimum Windows version to 10 (to match .NET 8)

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-12 08:31:32 +02:00
parent 0fa53f860a
commit 4240646ec7
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Engine/Platform/Windows/WindowsPlatform.cpp
View File

@@ -556,14 +556,8 @@ void WindowsPlatform::PreInit(void* hInstance)
FlaxDbgHelpUnlock(); FlaxDbgHelpUnlock();
#endif #endif
// Get system version
GetWindowsVersion(WindowsName, VersionMajor, VersionMinor, VersionBuild); GetWindowsVersion(WindowsName, VersionMajor, VersionMinor, VersionBuild);
// Validate platform
if (VersionMajor < 6)
{
Error(TEXT("Not supported operating system version."));
exit(-1);
}
} }
bool WindowsPlatform::IsWindows10() bool WindowsPlatform::IsWindows10()
@@ -640,25 +634,25 @@ bool WindowsPlatform::Init()
// Check if can run Engine on current platform // Check if can run Engine on current platform
#if WINVER >= 0x0A00 #if WINVER >= 0x0A00
if (!IsWindows10OrGreater() && !IsWindowsServer()) if (VersionMajor < 10 && !IsWindowsServer())
{ {
Platform::Fatal(TEXT("Flax Engine requires Windows 10 or higher.")); Platform::Fatal(TEXT("Flax Engine requires Windows 10 or higher."));
return true; return true;
} }
#elif WINVER >= 0x0603 #elif WINVER >= 0x0603
if (!IsWindows8Point1OrGreater() && !IsWindowsServer()) if ((VersionMajor < 8 || (VersionMajor == 8 && VersionMinor == 0)) && !IsWindowsServer())
{ {
Platform::Fatal(TEXT("Flax Engine requires Windows 8.1 or higher.")); Platform::Fatal(TEXT("Flax Engine requires Windows 8.1 or higher."));
return true; return true;
} }
#elif WINVER >= 0x0602 #elif WINVER >= 0x0602
if (!IsWindows8OrGreater() && !IsWindowsServer()) if (VersionMajor < 8 && !IsWindowsServer())
{ {
Platform::Fatal(TEXT("Flax Engine requires Windows 8 or higher.")); Platform::Fatal(TEXT("Flax Engine requires Windows 8 or higher."));
return true; return true;
} }
#else #else
if (!IsWindows7OrGreater() && !IsWindowsServer()) if (VersionMajor < 7 && !IsWindowsServer())
{ {
Platform::Fatal(TEXT("Flax Engine requires Windows 7 or higher.")); Platform::Fatal(TEXT("Flax Engine requires Windows 7 or higher."));
return true; return true;

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

@@ -17,7 +17,7 @@
// Fix compilation for Windows 8.1 on the latest Windows SDK // Fix compilation for Windows 8.1 on the latest Windows SDK
typedef enum _MFVideoSphericalFormat { } MFVideoSphericalFormat; typedef enum _MFVideoSphericalFormat { } MFVideoSphericalFormat;
#endif #endif
#if !defined(MF_SOURCE_READER_CURRENT_TYPE_INDEX) && !defined(PLATFORM_GDK) #if !defined(MF_SOURCE_READER_CURRENT_TYPE_INDEX) && !defined(PLATFORM_GDK) && WINVER < _WIN32_WINNT_WIN10
// Fix compilation for Windows 7 on the latest Windows SDK // Fix compilation for Windows 7 on the latest Windows SDK
#define MF_SOURCE_READER_CURRENT_TYPE_INDEX 0xFFFFFFFF #define MF_SOURCE_READER_CURRENT_TYPE_INDEX 0xFFFFFFFF
#endif #endif

2
Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchain.cs
View File

@@ -14,7 +14,7 @@ namespace Flax.Build
/// Specifies the minimum Windows version to use (eg. 10). /// Specifies the minimum Windows version to use (eg. 10).
/// </summary> /// </summary>
[CommandLine("winMinVer", "<version>", "Specifies the minimum Windows version to use (eg. 10).")] [CommandLine("winMinVer", "<version>", "Specifies the minimum Windows version to use (eg. 10).")]
public static string WindowsMinVer = "7"; public static string WindowsMinVer = "10";
} }
} }