From 45bd17b7e8cdc7d550c435de4a29b5ba76bc9893 Mon Sep 17 00:00:00 2001 From: Honeybunch Date: Tue, 3 May 2022 18:31:49 -0700 Subject: [PATCH] Slight tweak to get client library working with mingw --- CMakeLists.txt | 7 ++++++- client/TracySysTrace.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15991852..c9019d8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,11 @@ target_link_libraries( ${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") find_library(EXECINFO_LIBRARY NAMES execinfo REQUIRED) target_link_libraries(TracyClient PUBLIC ${EXECINFO_LIBRARY}) @@ -123,6 +128,6 @@ install(FILES ${client_includes} install(FILES ${common_includes} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) install(EXPORT TracyConfig - NAMESPACE Tracy:: + NAMESPACE Tracy:: FILE TracyConfig.cmake DESTINATION share/Tracy) diff --git a/client/TracySysTrace.cpp b/client/TracySysTrace.cpp index e1f81f97..6e6aca12 100644 --- a/client/TracySysTrace.cpp +++ b/client/TracySysTrace.cpp @@ -265,7 +265,7 @@ void WINAPI EventRecordCallbackVsync( PEVENT_RECORD record ) static void SetupVsync() { -#if _WIN32_WINNT >= _WIN32_WINNT_WINBLUE +#if _WIN32_WINNT >= _WIN32_WINNT_WINBLUE && !__MINGW32__ const auto psz = sizeof( EVENT_TRACE_PROPERTIES ) + MAX_PATH; s_propVsync = (EVENT_TRACE_PROPERTIES*)tracy_malloc( psz ); memset( s_propVsync, 0, sizeof( EVENT_TRACE_PROPERTIES ) );