diff --git a/include/Logger.hpp b/include/Logger.hpp index c84b50e..59bf01d 100644 --- a/include/Logger.hpp +++ b/include/Logger.hpp @@ -28,6 +28,10 @@ SOFTWARE. #include #include +#ifdef ERROR +#undef ERROR +#endif + enum class LogType { WARNING, diff --git a/include/thirdparty/dylib/dylib.hpp b/include/thirdparty/dylib/dylib.hpp index b467e34..3d72dbf 100644 --- a/include/thirdparty/dylib/dylib.hpp +++ b/include/thirdparty/dylib/dylib.hpp @@ -21,6 +21,8 @@ #include #endif +#define NOMINMAX + #if (defined(_WIN32) || defined(_WIN64)) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN