diff options
| author |  bunnei | 2015-08-31 21:20:36 -0400 |
|---|---|---|
| committer | bunnei | 2015-08-31 21:20:36 -0400 |
| commit | f05ae742a48c8aa2c353507675aac51af2ccec0d (patch) | |
| tree | 2a1e08271143ac142c6ef68b9a69d34993fe11c9 /src | |
| parent | Merge pull request #1092 from Subv/vertex_offset (diff) | |
| parent | Common: Fix MicroProfile compilation in MSVC2015 (diff) | |
| download | yuzu-f05ae742a48c8aa2c353507675aac51af2ccec0d.tar.gz yuzu-f05ae742a48c8aa2c353507675aac51af2ccec0d.tar.xz yuzu-f05ae742a48c8aa2c353507675aac51af2ccec0d.zip | |
Merge pull request #1083 from yuriks/microprofile-vs2015
Common: Fix MicroProfile compilation in MSVC2015
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/microprofile.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/microprofile.h b/src/common/microprofile.h index 9eb6016a8..d3b6cb97c 100644 --- a/src/common/microprofile.h +++ b/src/common/microprofile.h | |||
| @@ -11,6 +11,11 @@ | |||
| 11 | #define MICROPROFILE_CONTEXT_SWITCH_TRACE 0 | 11 | #define MICROPROFILE_CONTEXT_SWITCH_TRACE 0 |
| 12 | #define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048<<12) // 8 MB | 12 | #define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048<<12) // 8 MB |
| 13 | 13 | ||
| 14 | #ifdef _WIN32 | ||
| 15 | // This isn't defined by the standard library in MSVC2015 | ||
| 16 | typedef void* HANDLE; | ||
| 17 | #endif | ||
| 18 | |||
| 14 | #include <microprofile.h> | 19 | #include <microprofile.h> |
| 15 | 20 | ||
| 16 | #define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0) | 21 | #define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0) |