From 5f4eeee5f01e07393ab603d6baa705486d126913 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 3 May 2009 15:46:36 +0000 Subject: (svn r16221) -Change: support building 64 bits OSX binaries and add optional support for 64 bits binaries in OSX universal binaries. However, do not default to adding 64 bits binaries because benchmarking has shown that they are slower than the 32 bits binaries. --- src/music/qtmidi.cpp | 3 +++ src/video/cocoa/fullscreen.mm | 3 +++ 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/music/qtmidi.cpp b/src/music/qtmidi.cpp index bb4ef91d2..dce3e1033 100644 --- a/src/music/qtmidi.cpp +++ b/src/music/qtmidi.cpp @@ -19,6 +19,8 @@ */ +#ifndef NO_QUICKTIME + #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 #include @@ -347,3 +349,4 @@ void MusicDriver_QtMidi::SetVolume(byte vol) } } +#endif /* NO_QUICKTIME */ diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm index b011834a4..5cc7784ab 100644 --- a/src/video/cocoa/fullscreen.mm +++ b/src/video/cocoa/fullscreen.mm @@ -71,7 +71,10 @@ struct OTTD_QuartzGammaTable { @implementation NSScreen (NSScreenAccess) - (void) setFrame:(NSRect)frame; { +/* The 64 bits libraries don't seem to know about _frame, so this hack won't work. */ +#if !__LP64__ _frame = frame; +#endif } @end -- cgit v1.2.3-54-g00ecf