mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-22 14:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #745 from apache-hb/master

Browse Source 
Fix build and configure warnings when compiling with clang-cl
This commit is contained in:
Bartosz Taudul 2024-03-11 20:18:47 +01:00 committed by GitHub
commit 1ddecd4b99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -189,7 +189,7 @@ tracy_public_include_dirs = include_directories('public')
compiler = meson.get_compiler('cpp')
override_options = []
if compiler.get_id() != 'msvc'
if compiler.get_id() != 'msvc' and compiler.get_id() != 'clang-cl'
override_options += 'cpp_std=c++11'
endif

1
public/client/TracyCallstack.cpp
View File

@ -439,7 +439,6 @@ void InitCallstack()
MODULEINFO info;
if( GetModuleInformation( proc, mod[i], &info, sizeof( info ) ) != 0 )
{
const auto base = uint64_t( info.lpBaseOfDll );
char name[1024];
const auto nameLength = GetModuleFileNameA( mod[i], name, 1021 );
if( nameLength > 0 )

2
public/client/TracyProfiler.cpp
View File

@ -510,7 +510,7 @@ static const char* GetHostInfo()
# ifdef __MINGW32__
ptr += sprintf( ptr, "OS: Windows %i.%i.%i (MingW)\n", (int)ver.dwMajorVersion, (int)ver.dwMinorVersion, (int)ver.dwBuildNumber );
# else
ptr += sprintf( ptr, "OS: Windows %i.%i.%i\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber );
ptr += sprintf( ptr, "OS: Windows %lu.%lu.%lu\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber );
# endif
}
#elif defined __linux__