Skip to content

Commit

Permalink
OpenGL: Fix building on Windows and Linux. (Regression from commit 08…
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerman committed Jul 1, 2024
1 parent 086980d commit d4163a1
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions desmume/src/OGLRender.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d4163a1

Please sign in to comment.