ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OpenGL: Fix building on Windows and Linux. (Regression from commit 086980d.)

This commit is contained in:
rogerman 2024-07-01 16:26:46 -07:00
parent 086980deaf
commit d4163a1893
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desmume/src/OGLRender.h
View File

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