diff -r 3514f1c5e182 src/video/cocoa/cocoa_v.mm --- a/src/video/cocoa/cocoa_v.mm Tue Dec 29 04:27:39 2009 +0000 +++ b/src/video/cocoa/cocoa_v.mm Tue Dec 29 21:44:21 2009 +0100 @@ -203,25 +203,24 @@ static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp) { +#if defined ENABLE_COCOA_QUARTZ || defined ENABLE_COCOA_QUICKDRAW CocoaSubdriver *ret; - -#ifdef ENABLE_COCOA_QUARTZ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 +#endif + +#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. */ if (MacOSVersionIsAtLeast(10, 5, 0)) { ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp); if (ret != NULL) return ret; } #endif -#endif #ifdef ENABLE_COCOA_QUICKDRAW ret = QZ_CreateWindowQuickdrawSubdriver(width, height, bpp); if (ret != NULL) return ret; #endif -#ifdef ENABLE_COCOA_QUARTZ -#if 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 * or it failed to load for some reason. Fall back to Quartz if possible even though that driver is slower. @@ -231,7 +230,6 @@ if (ret != NULL) return ret; } #endif -#endif return NULL; }