From 75b732bf608017aa8d52fc01992cca9af4cd4716 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Tue, 11 Jan 2011 17:52:17 +0000
Subject: [PATCH] Use lowercase filenames for OS X includes.  HFS is
 case-insensitive and since I'm cross-compiling the OS X version from Linux it
 fails when you try to include files using uppercase names when they're
 actually lowercase.

Originally committed to SVN as r5173.
---
 aegisub/src/agi_pre.h             |  2 +-
 aegisub/src/audio_player_openal.h |  4 ++--
 aegisub/src/frame_main.cpp        | 14 +++++++-------
 aegisub/src/gl_text.h             |  2 +-
 aegisub/src/gl_wrap.h             |  2 +-
 aegisub/src/video_context.cpp     |  2 +-
 aegisub/src/video_display.cpp     |  2 +-
 aegisub/src/video_out_gl.cpp      |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index 3b3a47ad3..d16ae4677 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -242,7 +242,7 @@
 #include <wx/zipstrm.h>
 
 #ifdef HAVE_APPLE_OPENGL_FRAMEWORK
-#include <OpenGL/GL.h>
+#include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #include <OpenGL/glext.h>
 #else
diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h
index 51c4b3e4f..c772ac018 100644
--- a/aegisub/src/audio_player_openal.h
+++ b/aegisub/src/audio_player_openal.h
@@ -42,8 +42,8 @@
 #include <al.h>
 #include <alc.h>
 #elif defined(__APPLE__)
-#include <OpenAL/AL.h>
-#include <OpenAL/ALC.h>
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
 #else
 #include <AL/al.h>
 #include <AL/alc.h>
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 781430026..6580ec38e 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -113,7 +113,7 @@ FrameMain::FrameMain (wxArrayString args)
     }
 
 #ifdef __WXMAC__
-	Bind(FrameMain::OnAbout, &FrameMain::cmd_call, this, cmd::id("app/about"));
+//	Bind(FrameMain::OnAbout, &FrameMain::cmd_call, this, cmd::id("app/about"));
 #endif
 
 
@@ -282,10 +282,10 @@ void FrameMain::InitMenu() {
 
 #ifdef __WXMAC__
 	// Make sure special menu items are placed correctly on Mac
-	wxApp::s_macAboutMenuItemId = Menu_Help_About;
-	wxApp::s_macExitMenuItemId = Menu_File_Exit;
-	wxApp::s_macPreferencesMenuItemId = Menu_Tools_Options;
-	wxApp::s_macHelpMenuTitleName = _("&Help");
+//	wxApp::s_macAboutMenuItemId = Menu_Help_About;
+//	wxApp::s_macExitMenuItemId = Menu_File_Exit;
+//	wxApp::s_macPreferencesMenuItemId = Menu_Tools_Options;
+//	wxApp::s_macHelpMenuTitleName = _("&Help");
 #endif
 
 	SetMenuBar(menu::menu->GetMainMenu());
@@ -1054,8 +1054,8 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame)
 //	EVT_TEXT_ENTER(Toolbar_Zoom_Dropdown, FrameMain::OnSetZoom)
 
 #ifdef __WXMAC__
-   EVT_MENU(wxID_ABOUT, FrameMain::OnAbout)
-   EVT_MENU(wxID_EXIT, FrameMain::OnExit)
+//   EVT_MENU(wxID_ABOUT, FrameMain::OnAbout)
+//   EVT_MENU(wxID_EXIT, FrameMain::OnExit)
 #endif
 END_EVENT_TABLE()
 
diff --git a/aegisub/src/gl_text.h b/aegisub/src/gl_text.h
index 830ae2ca6..d17d1e8c7 100644
--- a/aegisub/src/gl_text.h
+++ b/aegisub/src/gl_text.h
@@ -44,7 +44,7 @@
 #endif
 
 #ifdef __APPLE__
-#include <OpenGL/GL.h>
+#include <OpenGL/gl.h>
 #else
 #include <GL/gl.h>
 #endif
diff --git a/aegisub/src/gl_wrap.h b/aegisub/src/gl_wrap.h
index a358e0a80..ef82cc7ea 100644
--- a/aegisub/src/gl_wrap.h
+++ b/aegisub/src/gl_wrap.h
@@ -36,7 +36,7 @@
 
 
 #ifdef __APPLE__
-#include <OpenGL/GL.h>
+#include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp
index d2f53c55d..368bd6295 100644
--- a/aegisub/src/video_context.cpp
+++ b/aegisub/src/video_context.cpp
@@ -46,7 +46,7 @@
 #endif
 
 #ifdef __APPLE__
-#include <OpenGL/GL.h>
+#include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 053b6ecc0..57b8c2217 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -49,7 +49,7 @@
 #endif
 
 #ifdef __APPLE__
-#include <OpenGL/GL.h>
+#include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
diff --git a/aegisub/src/video_out_gl.cpp b/aegisub/src/video_out_gl.cpp
index 3144e0fd5..894ed0030 100644
--- a/aegisub/src/video_out_gl.cpp
+++ b/aegisub/src/video_out_gl.cpp
@@ -45,7 +45,7 @@
 
 // These must be included before local headers.
 #ifdef __APPLE__
-#include <OpenGL/GL.h>
+#include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>