From d4163a1893b47c341b9b79bceab381acf3416b4f Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:26:46 -0700
Subject: [PATCH] OpenGL: Fix building on Windows and Linux. (Regression from
 commit 086980d.)

---
 desmume/src/OGLRender.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/desmume/src/OGLRender.h b/desmume/src/OGLRender.h
index e226dab3a..802c6c162 100755
--- a/desmume/src/OGLRender.h
+++ b/desmume/src/OGLRender.h
@@ -53,12 +53,11 @@
 	#define OPENGL_VARIANT_STANDARD
 	#define WIN32_LEAN_AND_MEAN
 	#include <windows.h>
+	#include <GL/gl.h>
+	#include <GL/glext.h>
 
 	#ifdef OGLRENDER_3_2_H
 		#include <GL/glcorearb.h>
-	#else
-		#include <GL/gl.h>
-		#include <GL/glext.h>
 	#endif
 
 	#define OGLEXT(procPtr, func)       procPtr func = NULL;
@@ -96,14 +95,13 @@
 	#define EXTERNOGLEXT(procPtr, func)
 #else
 	#define OPENGL_VARIANT_STANDARD
+	#include <GL/gl.h>
+	#include <GL/glext.h>
+	#include <GL/glx.h>
 
 	#ifdef OGLRENDER_3_2_H
 		#include "utils/glcorearb.h"
 	#else
-		#include <GL/gl.h>
-		#include <GL/glext.h>
-		#include <GL/glx.h>
-		
 		/* This is a workaround needed to compile against nvidia GL headers */
 		#ifndef GL_ALPHA_BLEND_EQUATION_ATI
 			#undef GL_VERSION_1_3