mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11540) -Fix: [OSX] Don't try to compile the quartz video driver on OSX 10.3. It will fail
This commit is contained in:
parent
4704d4619b
commit
5fcbb8f59b
|
@ -171,9 +171,18 @@ const char *GetCurrentLocale(const char *)
|
|||
NSArray* languages = [defs objectForKey:@"AppleLanguages"];
|
||||
NSString* preferredLang = [languages objectAtIndex:0];
|
||||
/* preferredLang is either 2 or 5 characters long ("xx" or "xx_YY"). */
|
||||
|
||||
/* MacOS 10.3.9 can't handle encoding:NSASCIIStringEncoding
|
||||
* we will completely disable compiling it for such old targets to avoid a warning */
|
||||
#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3)
|
||||
/* Note: MAC_OS_X_VERSION_MAX_ALLOWED is the current OSX version/SDK by default */
|
||||
if (MacOSVersionIsAtLeast(10, 4, 0)) {
|
||||
[ preferredLang getCString:retbuf maxLength:32 encoding:NSASCIIStringEncoding ];
|
||||
} else {
|
||||
#else
|
||||
/* 10.3.9 needs to start the { too */
|
||||
{
|
||||
#endif
|
||||
[ preferredLang getCString:retbuf maxLength:32 ];
|
||||
}
|
||||
return retbuf;
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
#ifndef VIDEO_COCOA_H
|
||||
#define VIDEO_COCOA_H
|
||||
|
||||
#include <AvailabilityMacros.h>
|
||||
|
||||
#include "../video_driver.hpp"
|
||||
|
||||
class VideoDriver_Cocoa: public VideoDriver {
|
||||
|
@ -59,9 +61,12 @@ public:
|
|||
extern CocoaSubdriver* _cocoa_subdriver;
|
||||
|
||||
CocoaSubdriver *QZ_CreateFullscreenSubdriver(int width, int height, int bpp);
|
||||
CocoaSubdriver *QZ_CreateWindowQuartzSubdriver(int width, int height, int bpp);
|
||||
CocoaSubdriver *QZ_CreateWindowQuickdrawSubdriver(int width, int height, int bpp);
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
CocoaSubdriver *QZ_CreateWindowQuartzSubdriver(int width, int height, int bpp);
|
||||
#endif
|
||||
|
||||
void QZ_GameSizeChanged();
|
||||
|
||||
void QZ_GameLoop();
|
||||
|
|
|
@ -232,10 +232,12 @@ static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp)
|
|||
{
|
||||
CocoaSubdriver *ret;
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
if (MacOSVersionIsAtLeast(10, 4, 0)) {
|
||||
ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp);
|
||||
if (ret != NULL) return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
ret = QZ_CreateWindowQuickdrawSubdriver(width, height, bpp);
|
||||
if (ret != NULL) return ret;
|
||||
|
|
|
@ -8,9 +8,10 @@
|
|||
|
||||
#ifdef WITH_COCOA
|
||||
|
||||
#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4
|
||||
#include <AvailabilityMacros.h>
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#import <sys/time.h> /* gettimeofday */
|
||||
#import <sys/param.h> /* for MAXPATHLEN */
|
||||
|
@ -801,4 +802,5 @@ CocoaSubdriver *QZ_CreateWindowQuartzSubdriver(int width, int height, int bpp)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 */
|
||||
#endif /* WITH_COCOA */
|
||||
|
|
Loading…
Reference in New Issue