mirror of
https://github.com/citra-emu/citra.git
synced 2024-12-23 20:40:05 +00:00
Merge pull request #1083 from yuriks/microprofile-vs2015
Common: Fix MicroProfile compilation in MSVC2015
This commit is contained in:
commit
f05ae742a4
@ -11,6 +11,11 @@
|
|||||||
#define MICROPROFILE_CONTEXT_SWITCH_TRACE 0
|
#define MICROPROFILE_CONTEXT_SWITCH_TRACE 0
|
||||||
#define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048<<12) // 8 MB
|
#define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048<<12) // 8 MB
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
// This isn't defined by the standard library in MSVC2015
|
||||||
|
typedef void* HANDLE;
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <microprofile.h>
|
#include <microprofile.h>
|
||||||
|
|
||||||
#define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0)
|
#define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user