aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2017-02-04 18:36:38 -0500
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-02-04 15:36:38 -0800
commitd8af401b2ca527cab11cb794d1cbe3fd1e64ec8b (patch)
treee3bd9d4c1a9f8fe1191f820b4120d5015b7471c6
parent97e06b0a0daccd3347ae1bcaf294093b5af32e85 (diff)
Fix Microprofile in MinGW (#2530)
-rw-r--r--CMakeLists.txt2
-rw-r--r--externals/microprofile/microprofile.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce9a290327..306959e242 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h
index f45c9ba82b..384863ccc7 100644
--- a/externals/microprofile/microprofile.h
+++ b/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;