diff options
| author |  bunnei | 2014-12-30 23:54:02 -0500 |
|---|---|---|
| committer | bunnei | 2014-12-30 23:54:02 -0500 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/common.h | |
| parent | Merge pull request #372 from lioncash/warn (diff) | |
| parent | Fix MSVC-related #defines and add CMakeLists comment (diff) | |
| download | yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip | |
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
Diffstat (limited to 'src/common/common.h')
| -rw-r--r-- | src/common/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/common.h b/src/common/common.h index 66f0ccd0c..ba33373ae 100644 --- a/src/common/common.h +++ b/src/common/common.h | |||
| @@ -50,11 +50,13 @@ private: | |||
| 50 | #elif defined _WIN32 | 50 | #elif defined _WIN32 |
| 51 | 51 | ||
| 52 | // Check MSC ver | 52 | // Check MSC ver |
| 53 | #if !defined _MSC_VER || _MSC_VER <= 1000 | 53 | #if defined _MSC_VER && _MSC_VER <= 1000 |
| 54 | #error needs at least version 1000 of MSC | 54 | #error needs at least version 1000 of MSC |
| 55 | #endif | 55 | #endif |
| 56 | 56 | ||
| 57 | #ifndef NOMINMAX | ||
| 57 | #define NOMINMAX | 58 | #define NOMINMAX |
| 59 | #endif | ||
| 58 | 60 | ||
| 59 | // Memory leak checks | 61 | // Memory leak checks |
| 60 | #define CHECK_HEAP_INTEGRITY() | 62 | #define CHECK_HEAP_INTEGRITY() |