forked from mia/Aegisub
Fix checks for which OpenGL headers to include on OS X
Originally committed to SVN as r6511.
This commit is contained in:
parent
0d45f98ae8
commit
45dbc8bd15
5 changed files with 5 additions and 5 deletions
|
@ -198,7 +198,7 @@
|
|||
#include <wx/xml/xml.h>
|
||||
#include <wx/zipstrm.h>
|
||||
|
||||
#ifdef HAVE_APPLE_OPENGL_FRAMEWORK
|
||||
#ifdef HAVE_OPENGL_GL_H
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#include <OpenGL/glext.h>
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include "gl_text.h"
|
||||
#include "utils.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#ifdef HAVE_OPENGL_GL_H
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#ifndef AGI_PRE
|
||||
#include <wx/msgdlg.h>
|
||||
|
||||
#ifdef HAVE_APPLE_OPENGL_FRAMEWORK
|
||||
#ifdef HAVE_OPENGL_GL_H
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#include <OpenGL/glext.h>
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include <wx/toolbar.h>
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
#ifdef HAVE_OPENGL_GL_H
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include <libaegisub/log.h>
|
||||
|
||||
// These must be included before local headers.
|
||||
#ifdef __APPLE__
|
||||
#ifdef HAVE_OPENGL_GL_H
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#else
|
||||
|
|
Loading…
Reference in a new issue