diff --git a/Source/Engine/Content/JsonAsset.cpp b/Source/Engine/Content/JsonAsset.cpp index 18e373246..c202b6bcf 100644 --- a/Source/Engine/Content/JsonAsset.cpp +++ b/Source/Engine/Content/JsonAsset.cpp @@ -4,6 +4,7 @@ #include "Engine/Threading/Threading.h" #if USE_EDITOR #include "Engine/Platform/File.h" +#include "Engine/Core/Types/DataContainer.h" #else #include "Storage/ContentStorageManager.h" #endif diff --git a/Source/ThirdParty/fmt/format.h b/Source/ThirdParty/fmt/format.h index dd21d8ff7..53e703b2c 100644 --- a/Source/ThirdParty/fmt/format.h +++ b/Source/ThirdParty/fmt/format.h @@ -161,9 +161,9 @@ FMT_END_NAMESPACE // __builtin_clz and __builtin_clzll, so only define FMT_BUILTIN_CLZ using the // MSVC intrinsics if the clz and clzll builtins are not available. #if FMT_MSC_VER && !defined(FMT_BUILTIN_CLZLL) && !defined(_MANAGED) -unsigned char _BitScanReverse(unsigned long* Index, unsigned long Mask); +extern "C" unsigned char _BitScanReverse(unsigned long* Index, unsigned long Mask); # ifdef _WIN64 -unsigned char _BitScanReverse64(unsigned long* Index, unsigned __int64 Mask); +extern "C" unsigned char _BitScanReverse64(unsigned long* Index, unsigned __int64 Mask); #endif FMT_BEGIN_NAMESPACE diff --git a/Source/ThirdParty/tracy/client/TracyProfiler.hpp b/Source/ThirdParty/tracy/client/TracyProfiler.hpp index 0cec00f11..434ca60cf 100644 --- a/Source/ThirdParty/tracy/client/TracyProfiler.hpp +++ b/Source/ThirdParty/tracy/client/TracyProfiler.hpp @@ -189,6 +189,7 @@ public: static void MemFreeCallstackNamed( const void* ptr, int depth, bool secure, const char* name ); static void SendCallstack( int depth ); static void ParameterRegister( ParameterCallback cb ); + static void ParameterSetup( uint32_t idx, const char* name, bool isBool, int32_t val ); void SendCallstack( int depth, const char* skipBefore ); static void CutCallstack( void* callstack, const char* skipBefore );