From 5454040fe33da7e9c74042204efe0212430d8396 Mon Sep 17 00:00:00 2001 From: YXHXianYu <2943003@qq.com> Date: Mon, 26 Feb 2024 12:25:17 +0800 Subject: [PATCH] fix: build error in archlinux --- engine/3rdparty/JoltPhysics/Jolt/Core/Core.h | 11 ++++++----- .../vulkanmemoryallocator/include/vk_mem_alloc.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/engine/3rdparty/JoltPhysics/Jolt/Core/Core.h b/engine/3rdparty/JoltPhysics/Jolt/Core/Core.h index 0821bad61..f2a45bd2a 100644 --- a/engine/3rdparty/JoltPhysics/Jolt/Core/Core.h +++ b/engine/3rdparty/JoltPhysics/Jolt/Core/Core.h @@ -164,12 +164,12 @@ // OS-specific includes #if defined(JPH_PLATFORM_WINDOWS) #define JPH_BREAKPOINT __debugbreak() -#elif defined(JPH_PLATFORM_BLUE) +#elif defined(JPH_PLATFORM_BLUE) // Configuration for a popular game console. - // This file is not distributed because it would violate an NDA. - // Creating one should only be a couple of minutes of work if you have the documentation for the platform + // This file is not distributed because it would violate an NDA. + // Creating one should only be a couple of minutes of work if you have the documentation for the platform // (you only need to define JPH_BREAKPOINT, JPH_PLATFORM_BLUE_GET_TICKS and JPH_PLATFORM_BLUE_GET_TICK_FREQUENCY and include the right header). - #include + #include #elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS) #include #include @@ -215,6 +215,7 @@ JPH_SUPPRESS_WARNINGS_STD_BEGIN #include #include #include +#include #include #include JPH_SUPPRESS_WARNINGS_STD_END @@ -268,7 +269,7 @@ static_assert(sizeof(void *) == 8, "Invalid size of pointer"); // Stack allocation #define JPH_STACK_ALLOC(n) alloca(n) - + // Shorthand for #ifdef _DEBUG / #endif #ifdef _DEBUG #define JPH_IF_DEBUG(...) __VA_ARGS__ diff --git a/engine/3rdparty/vulkanmemoryallocator/include/vk_mem_alloc.h b/engine/3rdparty/vulkanmemoryallocator/include/vk_mem_alloc.h index 0a4e59ac2..8c39ae3d1 100644 --- a/engine/3rdparty/vulkanmemoryallocator/include/vk_mem_alloc.h +++ b/engine/3rdparty/vulkanmemoryallocator/include/vk_mem_alloc.h @@ -2565,6 +2565,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( #ifdef VMA_IMPLEMENTATION #undef VMA_IMPLEMENTATION +#include #include #include #include