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.
This commit is contained in:
Amar Takhar 2011-01-11 17:52:17 +00:00
parent a7954fc3e0
commit 75b732bf60
8 changed files with 15 additions and 15 deletions

View File

@ -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

View File

@ -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>

View File

@ -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()

View File

@ -44,7 +44,7 @@
#endif
#ifdef __APPLE__
#include <OpenGL/GL.h>
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif

View File

@ -36,7 +36,7 @@
#ifdef __APPLE__
#include <OpenGL/GL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
#include <GL/gl.h>

View File

@ -46,7 +46,7 @@
#endif
#ifdef __APPLE__
#include <OpenGL/GL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
#include <GL/gl.h>

View File

@ -49,7 +49,7 @@
#endif
#ifdef __APPLE__
#include <OpenGL/GL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
#include <GL/gl.h>

View File

@ -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>