From f41e0f9f50a3497d269dfba83039761c48342efe Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 9 Jun 2020 00:13:28 +0200 Subject: [PATCH] - copied non-x86 compile fix from GZDoom. --- source/common/rendering/vulkan/shaders/vk_shader.cpp | 1 + source/common/utility/x86.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/common/rendering/vulkan/shaders/vk_shader.cpp b/source/common/rendering/vulkan/shaders/vk_shader.cpp index 6d459c6a1..7f9fa9a6f 100644 --- a/source/common/rendering/vulkan/shaders/vk_shader.cpp +++ b/source/common/rendering/vulkan/shaders/vk_shader.cpp @@ -25,6 +25,7 @@ #include "hw_shaderpatcher.h" #include "filesystem.h" #include "engineerrors.h" +#include "version.h" #include VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device) diff --git a/source/common/utility/x86.cpp b/source/common/utility/x86.cpp index 983360c09..d674ea24d 100644 --- a/source/common/utility/x86.cpp +++ b/source/common/utility/x86.cpp @@ -45,8 +45,9 @@ void CheckCPUID(CPUInfo *cpu) cpu->DataL1LineSize = 32; // Assume a 32-byte cache line } -void DumpCPUInfo(const CPUInfo *cpu) +FString DumpCPUInfo(const CPUInfo *cpu) { + return FString(); } #else