Skip to content
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

Jump to bottom

Fix builds on Ventura M1 #11

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

Fix builds on Ventura M1 #11

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions gl_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
/* Include prototype flag */
#if (defined(_WIN32) || defined(HAVE_W32API))
#define GL_GLEXT_PROCS
#else
#elif !defined(HAVE_AGL_GLUT)
#define GL_GLEXT_PROTOTYPES
#endif

/* Provide GL header files for Windows and Apple */
#define INCLUDE_LOCAL_HEADER defined(HAVE_W32API) || defined(__APPLE__)
#if defined(HAVE_W32API) || defined(__APPLE__)
#define INCLUDE_LOCAL_HEADER 1
#endif
#if INCLUDE_LOCAL_HEADER
#include "./include/GL/gl.h"
#else
Expand Down
4 changes: 4 additions & 0 deletions glext_procs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

#ifndef HAVE_AGL_GLUT
#ifndef __glext_procs_h_
#define __glext_procs_h_

Expand Down Expand Up @@ -16244,3 +16246,5 @@ static PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC glReplace
#endif

#endif

#endif /* HAVE_AGL_GLUT */
4 changes: 4 additions & 0 deletions utils/glext_procs.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
}
close(EXPS);

print EXTS "\n#ifndef HAVE_AGL_GLUT\n";

# Header
my $header = qq
{#ifndef %s
Expand Down Expand Up @@ -188,5 +190,7 @@
}
}

print EXTS "\n#endif /* HAVE_AGL_GLUT */\n";

close(EXTS);
close(FILE);