iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix checks for which OpenGL headers to include on OS X 

Originally committed to SVN as r6511.
This commit is contained in:
Thomas Goyne 2012-02-23 19:28:08 +00:00
parent 0d45f98ae8
commit 45dbc8bd15
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/src/agi_pre.h
View File

@ -198,7 +198,7 @@
#include <wx/xml/xml.h> #include <wx/xml/xml.h>
#include <wx/zipstrm.h> #include <wx/zipstrm.h>
#ifdef HAVE_APPLE_OPENGL_FRAMEWORK #ifdef HAVE_OPENGL_GL_H
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#include <OpenGL/glext.h> #include <OpenGL/glext.h>

2
aegisub/src/gl_text.cpp
View File

@ -47,7 +47,7 @@
#include "gl_text.h" #include "gl_text.h"
#include "utils.h" #include "utils.h"
#ifdef __APPLE__ #ifdef HAVE_OPENGL_GL_H
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>

2
aegisub/src/gl_wrap.cpp
View File

@ -29,7 +29,7 @@
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#ifdef HAVE_APPLE_OPENGL_FRAMEWORK #ifdef HAVE_OPENGL_GL_H
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#include <OpenGL/glext.h> #include <OpenGL/glext.h>

2
aegisub/src/video_display.cpp
View File

@ -48,7 +48,7 @@
#include <wx/toolbar.h> #include <wx/toolbar.h>
#endif #endif
#ifdef __APPLE__ #ifdef HAVE_OPENGL_GL_H
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else

2
aegisub/src/video_out_gl.cpp
View File

@ -44,7 +44,7 @@
#include <libaegisub/log.h> #include <libaegisub/log.h>
// These must be included before local headers. // These must be included before local headers.
#ifdef __APPLE__ #ifdef HAVE_OPENGL_GL_H
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else