dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r24524) -Fix [FS#5296]: fix some compile problems in mac-only code (__ln__)

Browse Source
This commit is contained in:
yexo
2012-09-13 18:42:33 +00:00
parent bd17361817
commit 1f75f81a41
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/macosx/G5_detector.cpp
View File

@@ -21,7 +21,7 @@
#endif #endif
/* this function is a lightly modified version of some code from Apple's developer homepage to detect G5 CPUs at runtime */ /* this function is a lightly modified version of some code from Apple's developer homepage to detect G5 CPUs at runtime */
main() int main()
{ {
host_basic_info_data_t hostInfo; host_basic_info_data_t hostInfo;
mach_msg_type_number_t infoCount; mach_msg_type_number_t infoCount;

4
src/video/cocoa/cocoa_v.mm
View File

@@ -241,7 +241,7 @@ static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp)
CocoaSubdriver *ret; CocoaSubdriver *ret;
#endif #endif
#ifdef ENABLE_COCOA_QUARTZ && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) #if defined(ENABLE_COCOA_QUARTZ) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
/* The reason for the version mismatch is due to the fact that the 10.4 binary needs to work on 10.5 as well. */ /* The reason for the version mismatch is due to the fact that the 10.4 binary needs to work on 10.5 as well. */
if (MacOSVersionIsAtLeast(10, 5, 0)) { if (MacOSVersionIsAtLeast(10, 5, 0)) {
ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp); ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp);
@@ -254,7 +254,7 @@ static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp)
if (ret != NULL) return ret; if (ret != NULL) return ret;
#endif #endif
#ifdef ENABLE_COCOA_QUARTZ && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) #if defined(ENABLE_COCOA_QUARTZ) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
/* /*
* If we get here we are running 10.4 or earlier and either openttd was compiled without the QuickDraw driver * If we get here we are running 10.4 or earlier and either openttd was compiled without the QuickDraw driver
* or it failed to load for some reason. Fall back to Quartz if possible even though that driver is slower. * or it failed to load for some reason. Fall back to Quartz if possible even though that driver is slower.

2
src/video/cocoa/fullscreen.mm
View File

@@ -65,7 +65,7 @@ struct OTTD_QuartzGammaTable {
@end @end
@implementation NSScreen (NSScreenAccess) @implementation NSScreen (NSScreenAccess)
- (void) setFrame:(NSRect)frame; - (void) setFrame:(NSRect)frame
{ {
/* The 64 bits libraries don't seem to know about _frame, so this hack won't work. */ /* The 64 bits libraries don't seem to know about _frame, so this hack won't work. */
#if !__LP64__ #if !__LP64__