summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ce9a29032..306959e24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,6 @@ if (NOT MSVC)
72 72
73 if (MINGW) 73 if (MINGW)
74 add_definitions(-DMINGW_HAS_SECURE_API) 74 add_definitions(-DMINGW_HAS_SECURE_API)
75 # Microprofile causes crashes when launching titles on MinGW
76 add_definitions(-DMICROPROFILE_ENABLED=0)
77 75
78 if (MINGW_STATIC_BUILD) 76 if (MINGW_STATIC_BUILD)
79 add_definitions(-DQT_STATICPLUGIN) 77 add_definitions(-DQT_STATICPLUGIN)
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h
index f45c9ba82..384863ccc 100644
--- a/externals/microprofile/microprofile.h
+++ b/externals/microprofile/microprofile.h
@@ -201,7 +201,7 @@ typedef uint64_t ThreadIdType;
201int64_t MicroProfileGetTick(); 201int64_t MicroProfileGetTick();
202#define MP_TICK() MicroProfileGetTick() 202#define MP_TICK() MicroProfileGetTick()
203#define MP_BREAK() __debugbreak() 203#define MP_BREAK() __debugbreak()
204#define MP_THREAD_LOCAL __declspec(thread) 204#define MP_THREAD_LOCAL thread_local
205#define MP_STRCASECMP _stricmp 205#define MP_STRCASECMP _stricmp
206#define MP_GETCURRENTTHREADID() GetCurrentThreadId() 206#define MP_GETCURRENTTHREADID() GetCurrentThreadId()
207typedef uint32_t ThreadIdType; 207typedef uint32_t ThreadIdType;