Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: build error in archlinux #480

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: build error in archlinux #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions engine/3rdparty/JoltPhysics/Jolt/Core/Core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Jolt/Core/PlatformBlue.h>
#include <Jolt/Core/PlatformBlue.h>
#elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS)
#include <float.h>
#include <limits.h>
Expand Down Expand Up @@ -215,6 +215,7 @@ JPH_SUPPRESS_WARNINGS_STD_BEGIN
#include <algorithm>
#include <utility>
#include <cmath>
#include <cstdint>
#include <sstream>
#include <functional>
JPH_SUPPRESS_WARNINGS_STD_END
Expand Down Expand Up @@ -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__
Expand Down
1 change: 1 addition & 0 deletions engine/3rdparty/vulkanmemoryallocator/include/vk_mem_alloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2565,6 +2565,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
#ifdef VMA_IMPLEMENTATION
#undef VMA_IMPLEMENTATION

#include <cstdio>
#include <cstdint>
#include <cstdlib>
#include <cstring>
Expand Down