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 #380 from Honeybunch/master

Browse Source 
Slight tweak to get client library working with mingw
This commit is contained in:
Bartosz Taudul 2022-05-14 12:48:09 +02:00 committed by GitHub
commit 6233cf3fdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -16,6 +16,11 @@ target_link_libraries(
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
) )
# Public dependency on some libraries required when using Mingw
if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
target_link_libraries(TracyClient PUBLIC ws2_32 dbghelp)
endif()
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
find_library(EXECINFO_LIBRARY NAMES execinfo REQUIRED) find_library(EXECINFO_LIBRARY NAMES execinfo REQUIRED)
target_link_libraries(TracyClient PUBLIC ${EXECINFO_LIBRARY}) target_link_libraries(TracyClient PUBLIC ${EXECINFO_LIBRARY})
@ -122,6 +127,6 @@ install(FILES ${client_includes}
install(FILES ${common_includes} install(FILES ${common_includes}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common)
install(EXPORT TracyConfig install(EXPORT TracyConfig
NAMESPACE Tracy:: NAMESPACE Tracy::
FILE TracyConfig.cmake FILE TracyConfig.cmake
DESTINATION share/Tracy) DESTINATION share/Tracy)

2
client/TracySysTrace.cpp
View File

@ -265,7 +265,7 @@ void WINAPI EventRecordCallbackVsync( PEVENT_RECORD record )
static void SetupVsync() static void SetupVsync()
{ {
#if _WIN32_WINNT >= _WIN32_WINNT_WINBLUE #if _WIN32_WINNT >= _WIN32_WINNT_WINBLUE && !defined(__MINGW32__)
const auto psz = sizeof( EVENT_TRACE_PROPERTIES ) + MAX_PATH; const auto psz = sizeof( EVENT_TRACE_PROPERTIES ) + MAX_PATH;
s_propVsync = (EVENT_TRACE_PROPERTIES*)tracy_malloc( psz ); s_propVsync = (EVENT_TRACE_PROPERTIES*)tracy_malloc( psz );
memset( s_propVsync, 0, sizeof( EVENT_TRACE_PROPERTIES ) ); memset( s_propVsync, 0, sizeof( EVENT_TRACE_PROPERTIES ) );