mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-10 02:31:48 +00:00
fix build warnings when compiling with clang-cl
This commit is contained in:
parent
082c13ac8e
commit
a26f076a0e
@ -189,7 +189,7 @@ tracy_public_include_dirs = include_directories('public')
|
|||||||
|
|
||||||
compiler = meson.get_compiler('cpp')
|
compiler = meson.get_compiler('cpp')
|
||||||
override_options = []
|
override_options = []
|
||||||
if compiler.get_id() != 'msvc'
|
if compiler.get_id() != 'msvc' and compiler.get_id() != 'clang-cl'
|
||||||
override_options += 'cpp_std=c++11'
|
override_options += 'cpp_std=c++11'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -439,7 +439,6 @@ void InitCallstack()
|
|||||||
MODULEINFO info;
|
MODULEINFO info;
|
||||||
if( GetModuleInformation( proc, mod[i], &info, sizeof( info ) ) != 0 )
|
if( GetModuleInformation( proc, mod[i], &info, sizeof( info ) ) != 0 )
|
||||||
{
|
{
|
||||||
const auto base = uint64_t( info.lpBaseOfDll );
|
|
||||||
char name[1024];
|
char name[1024];
|
||||||
const auto nameLength = GetModuleFileNameA( mod[i], name, 1021 );
|
const auto nameLength = GetModuleFileNameA( mod[i], name, 1021 );
|
||||||
if( nameLength > 0 )
|
if( nameLength > 0 )
|
||||||
|
@ -510,7 +510,7 @@ static const char* GetHostInfo()
|
|||||||
# ifdef __MINGW32__
|
# ifdef __MINGW32__
|
||||||
ptr += sprintf( ptr, "OS: Windows %i.%i.%i (MingW)\n", (int)ver.dwMajorVersion, (int)ver.dwMinorVersion, (int)ver.dwBuildNumber );
|
ptr += sprintf( ptr, "OS: Windows %i.%i.%i (MingW)\n", (int)ver.dwMajorVersion, (int)ver.dwMinorVersion, (int)ver.dwBuildNumber );
|
||||||
# else
|
# 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
|
# endif
|
||||||
}
|
}
|
||||||
#elif defined __linux__
|
#elif defined __linux__
|
||||||
|
Loading…
Reference in New Issue
Block a user