diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2017-02-05 00:36:38 +0100 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-02-05 00:36:38 +0100 |
| commit | d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b (patch) | |
| tree | e3bd9d4c1a9f8fe1191f820b4120d5015b7471c6 | |
| parent | Merge pull request #2476 from yuriks/shader-refactor3 (diff) | |
| download | yuzu-d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b.tar yuzu-d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b.tar.gz yuzu-d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b.tar.bz2 yuzu-d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b.tar.lz yuzu-d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b.tar.xz yuzu-d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b.tar.zst yuzu-d8af401b2ca527cab11cb794d1cbe3fd1e64ec8b.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | externals/microprofile/microprofile.h | 2 |
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) 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 f45c9ba82..384863ccc 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; |