Move GLU and windows.h include to gl_driver.cpp

OpenSRProject · Jun 3, 2024 · 062c367 · 062c367
1 parent 6be2137
commit 062c367
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/source/game/compat/gl.h b/source/game/compat/gl.h
@@ -1,12 +1,3 @@
 #pragma once
 #include "glad/gl.h"
-#ifdef _WIN32
-// defines APIENTRY, GL/gl.h includes it but Glad doesn't
-#  include <windows.h>
-#endif
-#if defined(__APPLE__) && defined(__MACH__)
-#  include <OpenGL/glu.h>
-#else
-#  include <GL/glu.h>
-#endif
 #include "GLFW/glfw3.h"
diff --git a/source/game/render/gl_driver.cpp b/source/game/render/gl_driver.cpp
@@ -14,9 +14,20 @@
 #include "main/references.h"
 #include "main/tick.h"
 #include "main/logging.h"
-#include "matrix.h"
 #include "frustum.h"
-#include <algorithm>
+
+#ifdef _WIN32
+#  define NOMINMAX
+#  define WIN32_LEAN_AND_MEAN
+// defines APIENTRY, GL/gl.h includes it but Glad doesn't
+#  include <windows.h>
+#endif
+#if defined(__APPLE__) && defined(__MACH__)
+#  include <OpenGL/glu.h>
+#else
+#  include <GL/glu.h>
+#endif
+
 extern char lockText[1024];
 
 bool glDirectStateAccess = false;