From 45dbc8bd150b03ecdf1b83111be4561778b0af97 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 23 Feb 2012 19:28:08 +0000
Subject: [PATCH] Fix checks for which OpenGL headers to include on OS X

Originally committed to SVN as r6511.
---
 aegisub/src/agi_pre.h         | 2 +-
 aegisub/src/gl_text.cpp       | 2 +-
 aegisub/src/gl_wrap.cpp       | 2 +-
 aegisub/src/video_display.cpp | 2 +-
 aegisub/src/video_out_gl.cpp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index f2cfe7d68..6258fa3c8 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -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>
diff --git a/aegisub/src/gl_text.cpp b/aegisub/src/gl_text.cpp
index b4b34e4d3..bca36fcba 100644
--- a/aegisub/src/gl_text.cpp
+++ b/aegisub/src/gl_text.cpp
@@ -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>
diff --git a/aegisub/src/gl_wrap.cpp b/aegisub/src/gl_wrap.cpp
index 7854fd966..ea8aa9ce1 100644
--- a/aegisub/src/gl_wrap.cpp
+++ b/aegisub/src/gl_wrap.cpp
@@ -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>
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 113a59352..02dce1dbb 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -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
diff --git a/aegisub/src/video_out_gl.cpp b/aegisub/src/video_out_gl.cpp
index 8db78d2e3..0cb8cad21 100644
--- a/aegisub/src/video_out_gl.cpp
+++ b/aegisub/src/video_out_gl.cpp
@@ -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