From 22755857958a7fcc7375dda50db4cbbd3271f8a8 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Sat, 24 Oct 2020 17:30:20 +0200 Subject: [PATCH] Undef Windows.h macros that cause conflicts This caused errors on calls to Path::CreateDirectory in source files that include OpenGLAPI.h. --- src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h index ded0e1dc03..dd9a3f1370 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h @@ -42,8 +42,10 @@ #endif #include -// OpenRCT2: SDL_opengl.h includes windows.h, which defines the CreateWindow macro and causes conflicts +// OpenRCT2: SDL_opengl.h includes windows.h, which defines some macros that can cause conflicts #undef CreateWindow +#undef CreateDirectory +#undef GetMessage #ifdef OPENGL_NO_LINK