Skip to content

fix(build): hoist GL_GLEXT_PROTOTYPES out of __APPLE__ branch #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DTW-Thalion wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(build): hoist GL_GLEXT_PROTOTYPES out of __APPLE__ branch #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Source/CABackingStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,15 @@
#if GNUSTEP
#import <CoreGraphics/CoreGraphics.h>
#endif
#if (__APPLE__)
/* GL_GLEXT_PROTOTYPES must be defined BEFORE <GL/gl.h> is included so that
* when gl.h transitively pulls in glext.h, the OpenGL 2.0+ prototypes
* (glUseProgram etc.) are declared. Previously this define was inside the
* __APPLE__ branch, so the Linux build of CARenderer.m saw an undefined
* glUseProgram and failed on modern clang (which treats implicit function
* declarations as errors).
*/
#define GL_GLEXT_PROTOTYPES 1
#if (__APPLE__)
#import <OpenGL/OpenGL.h>
#import <OpenGL/gl.h>
#import <OpenGL/glu.h>
Expand Down