From ae9aa82d601a1d85e5c7b8dd7a2f360e1fae7644 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 6 May 2011 13:51:45 -0400 Subject: [PATCH] [Xcode4] LowLevelWindow behaves. Well...with clang anyway. That's the compiler Apple wishes to go with, so may as well support it. Glew is the only thing left it looks like. --- Xcode/stepmania_xcode4.xcodeproj/project.pbxproj | 6 +++--- src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj b/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj index 93ea5f8550..32448ba42b 100644 --- a/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj +++ b/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj @@ -7167,7 +7167,7 @@ ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = "non-global"; @@ -7560,7 +7560,7 @@ ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = YES; STRIP_STYLE = "non-global"; @@ -7895,7 +7895,7 @@ ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = YES; STRIP_STYLE = "non-global"; diff --git a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h index 499fd4d295..dd57ad7199 100644 --- a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h +++ b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h @@ -8,7 +8,11 @@ typedef const struct __CFDictionary *CFDictionaryRef; /* XXX: This was changed to a uint32_t later and its header file cannot be included * since Style conflicts. Ugh. */ +#if __APPLE_CC__ < 5621 typedef struct _CGDirectDisplayID *CGDirectDisplayID; +#else +typedef uint32_t *CGDirectDisplayID; +#endif class LowLevelWindow_MacOSX : public LowLevelWindow {