Sfoglia il codice sorgente

Fix Microprofile in MinGW (#2530)

Fernando Sahmkow 9 anni fa
parent
commit
d8af401b2c
2 ha cambiato i file con 1 aggiunte e 3 eliminazioni
  1. 0 2
      CMakeLists.txt
  2. 1 1
      externals/microprofile/microprofile.h

+ 0 - 2
CMakeLists.txt

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

+ 1 - 1
externals/microprofile/microprofile.h

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