Browse Source

Fix Microprofile in MinGW (#2530)

nce_cpp
Fernando Sahmkow 9 years ago
committed by Yuri Kunde Schlesner
parent
commit
b0fd75916a
  1. 2
      CMakeLists.txt
  2. 2
      externals/microprofile/microprofile.h

2
CMakeLists.txt

@ -72,8 +72,6 @@ if (NOT MSVC)
if (MINGW) if (MINGW)
add_definitions(-DMINGW_HAS_SECURE_API) add_definitions(-DMINGW_HAS_SECURE_API)
# Microprofile causes crashes when launching titles on MinGW
add_definitions(-DMICROPROFILE_ENABLED=0)
if (MINGW_STATIC_BUILD) if (MINGW_STATIC_BUILD)
add_definitions(-DQT_STATICPLUGIN) add_definitions(-DQT_STATICPLUGIN)

2
externals/microprofile/microprofile.h

@ -201,7 +201,7 @@ typedef uint64_t ThreadIdType;
int64_t MicroProfileGetTick(); int64_t MicroProfileGetTick();
#define MP_TICK() MicroProfileGetTick() #define MP_TICK() MicroProfileGetTick()
#define MP_BREAK() __debugbreak() #define MP_BREAK() __debugbreak()
#define MP_THREAD_LOCAL __declspec(thread)
#define MP_THREAD_LOCAL thread_local
#define MP_STRCASECMP _stricmp #define MP_STRCASECMP _stricmp
#define MP_GETCURRENTTHREADID() GetCurrentThreadId() #define MP_GETCURRENTTHREADID() GetCurrentThreadId()
typedef uint32_t ThreadIdType; typedef uint32_t ThreadIdType;

Loading…
Cancel
Save