octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Microprofile in MinGW (#2530)

Browse Source
This commit is contained in:
Fernando Sahmkow
2017-02-04 18:36:38 -05:00
committed by Yuri Kunde Schlesner
parent 97e06b0a0d
commit d8af401b2c
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -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 vendored
View File

@@ -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;