From 278dead0bd345226c660a64d9dd0dac2dc982c6f Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 12 Aug 2025 12:34:32 +0200 Subject: [PATCH] Add `PLATFORM_CONSOLE` define and fix desktop to be as Windows/UWP, not Win32 --- Source/Engine/Graphics/Graphics.cpp | 2 +- Source/Engine/Platform/Defines.h | 3 +++ Source/Engine/Platform/UWP/UWPDefines.h | 1 + Source/Engine/Platform/Win32/Win32Defines.h | 1 - Source/Engine/Platform/Windows/WindowsDefines.h | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Graphics/Graphics.cpp b/Source/Engine/Graphics/Graphics.cpp index ec9cd5067..dd3344f5d 100644 --- a/Source/Engine/Graphics/Graphics.cpp +++ b/Source/Engine/Graphics/Graphics.cpp @@ -202,7 +202,7 @@ bool GraphicsService::Init() #endif ) { -#if !USE_EDITOR && BUILD_RELEASE && !PLATFORM_LINUX // IsDebugToolAttached seams to be enabled on many Linux machines via VK_EXT_tooling_info +#if !USE_EDITOR && BUILD_RELEASE && !PLATFORM_LINUX && !PLATFORM_CONSOLE // IsDebugToolAttached seams to be enabled on many Linux machines via VK_EXT_tooling_info // Block graphics debugging to protect contents Platform::Fatal(TEXT("Graphics debugger attached.")); #endif diff --git a/Source/Engine/Platform/Defines.h b/Source/Engine/Platform/Defines.h index 29f64052d..de56fdcb6 100644 --- a/Source/Engine/Platform/Defines.h +++ b/Source/Engine/Platform/Defines.h @@ -174,6 +174,9 @@ API_ENUM() enum class ArchitectureType #ifndef PLATFORM_DESKTOP #define PLATFORM_DESKTOP 0 #endif +#ifndef PLATFORM_CONSOLE +#define PLATFORM_CONSOLE 0 +#endif #ifndef PLATFORM_ARCH_X64 #define PLATFORM_ARCH_X64 0 #endif diff --git a/Source/Engine/Platform/UWP/UWPDefines.h b/Source/Engine/Platform/UWP/UWPDefines.h index a989bcaac..a5a6cabc8 100644 --- a/Source/Engine/Platform/UWP/UWPDefines.h +++ b/Source/Engine/Platform/UWP/UWPDefines.h @@ -8,6 +8,7 @@ // Platform description #define PLATFORM_TYPE PlatformType::UWP +#define PLATFORM_DESKTOP 1 // Use AOT for Mono #define USE_MONO_AOT 1 diff --git a/Source/Engine/Platform/Win32/Win32Defines.h b/Source/Engine/Platform/Win32/Win32Defines.h index c6a0438fa..758cfde20 100644 --- a/Source/Engine/Platform/Win32/Win32Defines.h +++ b/Source/Engine/Platform/Win32/Win32Defines.h @@ -5,7 +5,6 @@ #if PLATFORM_WIN32 // Platform description -#define PLATFORM_DESKTOP 1 #if defined(WIN64) && defined(_M_X64) #define PLATFORM_64BITS 1 #define PLATFORM_ARCH_X64 1 diff --git a/Source/Engine/Platform/Windows/WindowsDefines.h b/Source/Engine/Platform/Windows/WindowsDefines.h index 35180ba37..7db9538c4 100644 --- a/Source/Engine/Platform/Windows/WindowsDefines.h +++ b/Source/Engine/Platform/Windows/WindowsDefines.h @@ -9,5 +9,6 @@ // Platform description #define PLATFORM_TYPE PlatformType::Windows #define PLATFORM_HAS_HEADLESS_MODE 1 +#define PLATFORM_DESKTOP 1 #endif