diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-04-02 20:05:38 +0100 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-04-02 20:05:38 +0100 |
| commit | 12c252fdeb0bc8af4200b8e01d8e2b9fc11e8ded (patch) | |
| tree | 98eb7a8edd0ffa66884207431b3b0d3c755ab1a4 | |
| parent | c9185202fe841984f984326dfc1ab5ef5d00d6f9 (diff) | |
| parent | 39506c62cb89d42e876c49e7e353140cd6be61b7 (diff) | |
| download | YAGE-12c252fdeb0bc8af4200b8e01d8e2b9fc11e8ded.tar.gz YAGE-12c252fdeb0bc8af4200b8e01d8e2b9fc11e8ded.zip | |
Merge branch 'master' of github.com:ymherklotz/YAGE
| -rw-r--r-- | yage/core/loglevel.h | 14 | ||||
| -rw-r--r-- | yage/data/input.h | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/yage/core/loglevel.h b/yage/core/loglevel.h index 2247375d..51d28398 100644 --- a/yage/core/loglevel.h +++ b/yage/core/loglevel.h @@ -9,6 +9,13 @@ #ifndef YAGE_CORE_LOGLEVEL_H #define YAGE_CORE_LOGLEVEL_H +#ifdef _WIN32 +#ifdef ERROR +#define YAGE_ERROR_TMP ERROR +#undef ERROR +#endif +#endif + namespace yage { @@ -37,4 +44,11 @@ enum class LogLevel { }; } +#ifdef _WIN32 +#ifdef YAGE_ERROR_TMP +#define ERROR YAGE_ERROR_TMP +#undef YAGE_ERROR_TMP +#endif +#endif + #endif diff --git a/yage/data/input.h b/yage/data/input.h index 866793d8..22cadb62 100644 --- a/yage/data/input.h +++ b/yage/data/input.h @@ -9,6 +9,13 @@ #ifndef YAGE_CORE_INPUT_H #define YAGE_CORE_INPUT_H +#ifdef _WIN32 +#ifdef DELETE +#define YAGE_DELETE_TMP DELETE +#undef DELETE +#endif +#endif + #define GLFW_INCLUDE_NONE #include <GLFW/glfw3.h> @@ -148,4 +155,11 @@ enum class key { } // namepsace yage +#ifdef _WIN32 +#ifdef YAGE_DELETE_TMP +#define DELETE YAGE_DELETE_TMP +#undef YAGE_DELETE_TMP +#endif +#endif + #endif |