star.cpp, winsys.cpp: Correct gl.h include sequence on Windows

vegastrike · Apr 30, 2024 · 9c21d7d · 9c21d7d
1 parent 013b5c2
commit 9c21d7d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/engine/src/gfx/star.cpp b/engine/src/gfx/star.cpp
@@ -37,9 +37,15 @@
 #include "vs_logging.h"
 
 #if defined(__APPLE__) && defined(__MACH__)
-#include <OpenGL/gl.h>
+#   include <OpenGL/gl.h>
+#elif defined (_WIN32) || defined (__CYGWIN__)
+#   ifndef NOMINMAX
+#       define NOMINMAX
+#   endif //tells VCC not to generate min/max macros
+#   include <windows.h>
+#   include <GL/gl.h>
 #else
-#include <GL/gl.h>
+#   include <GL/gl.h>
 #endif
 
 #define SINX 1

diff --git a/engine/src/gldrv/winsys.cpp b/engine/src/gldrv/winsys.cpp
@@ -24,8 +24,15 @@
  */
 
 #include <SDL2/SDL.h>
-#if defined (__APPLE__) && defined (__MACH__)
+
+#if defined(__APPLE__) && defined(__MACH__)
 #   include <OpenGL/gl.h>
+#elif defined (_WIN32) || defined (__CYGWIN__)
+#   ifndef NOMINMAX
+#       define NOMINMAX
+#   endif //tells VCC not to generate min/max macros
+#   include <windows.h>
+#   include <GL/gl.h>
 #else
 #   include <GL/gl.h>
 #endif