From 24cb0e77ebada5b2ca4549ce6cc85ace54afe00b Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Wed, 2 Jun 2021 23:57:45 -0400 Subject: [PATCH] Fix MSVC builds after recent changes --- 3d-viewer/common_ogl/ogl_utils.cpp | 1 + 3d-viewer/common_ogl/openGL_includes.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/3d-viewer/common_ogl/ogl_utils.cpp b/3d-viewer/common_ogl/ogl_utils.cpp index 0628acfef5..4960632154 100644 --- a/3d-viewer/common_ogl/ogl_utils.cpp +++ b/3d-viewer/common_ogl/ogl_utils.cpp @@ -27,6 +27,7 @@ * @brief implements generic openGL functions that are common to any openGL target */ +#include #include // Must be included first #include "openGL_includes.h" diff --git a/3d-viewer/common_ogl/openGL_includes.h b/3d-viewer/common_ogl/openGL_includes.h index d8df359229..5ce225c588 100644 --- a/3d-viewer/common_ogl/openGL_includes.h +++ b/3d-viewer/common_ogl/openGL_includes.h @@ -37,6 +37,13 @@ #include #include #else + +#ifdef _WIN32 +// required for the windows gl.h to work +#define WIN32_LEAN_AND_MEAN +#include +#endif + #include #include #endif