diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-02-03 18:27:05 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-02-03 18:27:05 +0000 |
| commit | 0b609923f0f4bf4de49178f1bd98c4eb2cd421c1 (patch) | |
| tree | c7dc2fe58a429ff00c998d9a685ade5a01336217 | |
| parent | 681435f6f1001df8e106b6d1f2a5bc59bf4115c8 (diff) | |
| download | YAGE-0b609923f0f4bf4de49178f1bd98c4eb2cd421c1.tar.gz YAGE-0b609923f0f4bf4de49178f1bd98c4eb2cd421c1.zip | |
[Doc] Making windows compatibilty more readable.
| -rw-r--r-- | yage/core/loglevel.h | 26 | ||||
| -rw-r--r-- | yage/data/input.h | 26 |
2 files changed, 28 insertions, 24 deletions
diff --git a/yage/core/loglevel.h b/yage/core/loglevel.h index bb115bbf..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 { @@ -28,20 +35,8 @@ enum class LogLevel { /// Warning message. WARNING, -#ifdef _WIN32 -#ifdef ERROR -#define YAGE_ERROR_TMP ERROR -#undef ERROR -#endif -#endif /// Error message. ERROR, -#ifdef _WIN32 -#ifdef YAGE_ERROR_TMP -#define ERROR YAGE_ERROR_TMP -#undef YAGE_ERROR_TMP -#endif -#endif /// Fatal message that should be output when the game /// crashes. @@ -49,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 4d5e09b3..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> @@ -77,19 +84,7 @@ enum class key { TAB = GLFW_KEY_TAB, BACKSPACE = GLFW_KEY_BACKSPACE, INSERT = GLFW_KEY_INSERT, -#ifdef _WIN32 -#ifdef DELETE -#define YAGE_DELETE_TMP DELETE -#undef DELETE -#endif -#endif DELETE = GLFW_KEY_DELETE, -#ifdef _WIN32 -#ifdef YAGE_DELETE_TMP -#define DELETE YAGE_DELETE_TMP -#undef YAGE_DELETE_TMP -#endif -#endif RIGHT = GLFW_KEY_RIGHT, LEFT = GLFW_KEY_LEFT, DOWN = GLFW_KEY_DOWN, @@ -160,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 |