From 872b555aab1a39f7492a5aca1a7f87dc306341fa Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 21 May 2011 20:07:41 -0400 Subject: [PATCH 01/14] New branch: [tiger] Funny, our goal is to remove tiger support. --- Xcode/stepmania.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index cced632c26..f0f81a39da 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -7280,12 +7280,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = 10.3; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; + MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; 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; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = NO; @@ -7817,12 +7817,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = 10.3; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; + MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; 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; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = YES; @@ -8153,12 +8153,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = 10.3; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; + MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; 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; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = YES; @@ -8282,13 +8282,13 @@ GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = 10.4; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; + MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; SDKROOT = macosx10.4; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = YES; From c22bce662895a1c2a8900ef1b750b646acb01cb1 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 21 May 2011 21:13:21 -0400 Subject: [PATCH 02/14] Stick with uint32_t. Doesn't cause errors. --- src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h index 499fd4d295..d291a49ced 100644 --- a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h +++ b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h @@ -8,7 +8,7 @@ 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. */ -typedef struct _CGDirectDisplayID *CGDirectDisplayID; +typedef uint32_t CGDirectDisplayID; class LowLevelWindow_MacOSX : public LowLevelWindow { From 1fb752ab0e1299a67212d07f6b1dd6b8d505f6ad Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 21 May 2011 21:22:55 -0400 Subject: [PATCH 03/14] [tiger] Same target: 10.5 --- Xcode/stepmania.xcodeproj/project.pbxproj | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index f0f81a39da..ebca7b9c69 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -7182,7 +7182,7 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.2; + MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = version; ZERO_LINK = NO; }; @@ -7279,9 +7279,9 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.5; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; @@ -7816,9 +7816,9 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.5; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; @@ -7898,7 +7898,7 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.2; + MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = version; ZERO_LINK = NO; }; @@ -8059,7 +8059,7 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.2; + MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = version; ZERO_LINK = NO; }; @@ -8152,9 +8152,9 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.5; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; @@ -8187,7 +8187,7 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.2; + MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = version; ZERO_LINK = NO; }; @@ -8281,9 +8281,9 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; LINKER_DISPLAYS_MANGLED_NAMES = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.5; MACOSX_DEPLOYMENT_TARGET_i386 = 10.5; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.5; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; From e71343695811d0e64a20d918b9e63d28db9aa9c5 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 21 May 2011 21:25:17 -0400 Subject: [PATCH 04/14] [tiger] Mac 10.5 does this differently. --- src/archutils/Unix/Backtrace.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/archutils/Unix/Backtrace.cpp b/src/archutils/Unix/Backtrace.cpp index ac61d6bcf5..00c8fa64dd 100644 --- a/src/archutils/Unix/Backtrace.cpp +++ b/src/archutils/Unix/Backtrace.cpp @@ -456,9 +456,15 @@ void InitializeBacktrace() void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc ) { +#if !defined(MACOSX) ctx->ip = (void *) uc->uc_mcontext->ss.eip; ctx->bp = (void *) uc->uc_mcontext->ss.ebp; ctx->sp = (void *) uc->uc_mcontext->ss.esp; +#else + ctx->ip = (void *) uc->uc_mcontext->__ss.__eip; + ctx->bp = (void *) uc->uc_mcontext->__ss.__ebp; + ctx->sp = (void *) uc->uc_mcontext->__ss.__esp; +#endif } /* The following from VirtualDub: */ From 0ec7e930dfefa184f19982b78eafcd0d8336b1d6 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 21 May 2011 21:29:04 -0400 Subject: [PATCH 05/14] [tiger] The states need _t with them. Now why the heck is glew not cooperating when it did so on min version 10.4? --- src/archutils/Darwin/DarwinThreadHelpers.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/archutils/Darwin/DarwinThreadHelpers.cpp b/src/archutils/Darwin/DarwinThreadHelpers.cpp index 44dda87a5d..bd88592a3a 100644 --- a/src/archutils/Darwin/DarwinThreadHelpers.cpp +++ b/src/archutils/Darwin/DarwinThreadHelpers.cpp @@ -28,7 +28,7 @@ bool GetThreadBacktraceContext( uint64_t iID, BacktraceContext *ctx ) thread_act_t thread = thread_act_t( iID ); #if defined(__ppc__) - ppc_thread_state state; + ppc_thread_state_t state; mach_msg_type_number_t count = PPC_THREAD_STATE_COUNT; if( thread_get_state(thread, PPC_THREAD_STATE, thread_state_t(&state), &count) ) @@ -37,14 +37,14 @@ bool GetThreadBacktraceContext( uint64_t iID, BacktraceContext *ctx ) ctx->PC = (void *)state.srr0; return true; #elif defined(__i386__) - i386_thread_state state; + i386_thread_state_t state; mach_msg_type_number_t count = i386_THREAD_STATE_COUNT; if( thread_get_state(thread, i386_THREAD_STATE, thread_state_t(&state), &count) ) return false; - ctx->ip = (void *)state.eip; - ctx->bp = (void *)state.ebp; - ctx->sp = (void *)state.esp; + ctx->ip = (void *)state.__eip; + ctx->bp = (void *)state.__ebp; + ctx->sp = (void *)state.__esp; return true; #else return false; From c111febd7c9740f79938097c7b34d83e45aa47df Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 21 May 2011 22:17:42 -0400 Subject: [PATCH 06/14] [tiger] Consistent 10.5 usage...hopefully. --- Xcode/stepmania.xcodeproj/project.pbxproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index ebca7b9c69..6c1dd1a4f5 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -7285,6 +7285,7 @@ ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; + SDKROOT = macosx10.5; SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; @@ -7822,6 +7823,7 @@ ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; + SDKROOT = macosx10.5; SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; @@ -8158,6 +8160,7 @@ ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; + SDKROOT = macosx10.5; SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; @@ -8287,7 +8290,7 @@ ONLY_LINK_ESSENTIAL_SYMBOLS = YES; PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - SDKROOT = macosx10.4; + SDKROOT = macosx10.5; SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; From 30f7038a29c48f15488a7cb8cfba638a3b9a2b4f Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 29 May 2011 21:32:55 -0400 Subject: [PATCH 07/14] [tiger] Add glew target, made it first. Still get the gl.h before glew.h error. May need another Mac user for help here. --- Xcode/stepmania.xcodeproj/project.pbxproj | 176 +++++++++++++++++++++- 1 file changed, 174 insertions(+), 2 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 1ff7d755c7..ea50c39725 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -35,6 +35,7 @@ 2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */; }; 2BA792601304F20D002BD8E1 /* NotesWriterSSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */; }; 2BA792611304F20D002BD8E1 /* NotesWriterSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */; }; + 2BBF97CC139327F300D950F6 /* glew.c in Sources */ = {isa = PBXBuildFile; fileRef = EE879BAA132E06C50078FDDC /* glew.c */; }; 2BC6132413773C8E00CC8BBD /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BC6130D13773C8E00CC8BBD /* png.c */; }; 2BC6132513773C8E00CC8BBD /* png.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BC6130E13773C8E00CC8BBD /* png.h */; }; 2BC6132613773C8E00CC8BBD /* pngconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BC6130F13773C8E00CC8BBD /* pngconf.h */; }; @@ -1665,7 +1666,6 @@ EE879B61132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = EE879B5D132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h */; }; EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE879B5E132DEE720078FDDC /* RageDisplay_Legacy.cpp */; }; EE879B63132DEE720078FDDC /* RageDisplay_Legacy.h in Headers */ = {isa = PBXBuildFile; fileRef = EE879B5F132DEE720078FDDC /* RageDisplay_Legacy.h */; }; - EE879BC3132E06C50078FDDC /* glew.c in Sources */ = {isa = PBXBuildFile; fileRef = EE879BAA132E06C50078FDDC /* glew.c */; }; EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */; }; EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */; }; EE906F8212BF3AF800146C96 /* JsonUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F8012BF3AF800146C96 /* JsonUtil.cpp */; }; @@ -1680,6 +1680,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 2BBF97CD139327FC00D950F6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 2BBF97C5139327A800D950F6 /* glew */; + remoteInfo = glew; + }; AA30C61907F5E2EF0066F398 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -1812,6 +1819,7 @@ 2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderSSC.h; path = ../src/NotesLoaderSSC.h; sourceTree = SOURCE_ROOT; }; 2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesWriterSSC.cpp; path = ../src/NotesWriterSSC.cpp; sourceTree = SOURCE_ROOT; }; 2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesWriterSSC.h; path = ../src/NotesWriterSSC.h; sourceTree = SOURCE_ROOT; }; + 2BBF97C6139327A800D950F6 /* libglew.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libglew.a; sourceTree = BUILT_PRODUCTS_DIR; }; 2BC6130D13773C8E00CC8BBD /* png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../extern/libpng/include/png.c; sourceTree = SOURCE_ROOT; }; 2BC6130E13773C8E00CC8BBD /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = png.h; path = ../extern/libpng/include/png.h; sourceTree = SOURCE_ROOT; }; 2BC6130F13773C8E00CC8BBD /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = ../extern/libpng/include/pngconf.h; sourceTree = SOURCE_ROOT; }; @@ -3049,6 +3057,13 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 2BBF97C4139327A800D950F6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; AA29CE3B0558741A00961A51 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3187,6 +3202,7 @@ AA7C895F0B67444700FD9940 /* libtommath.a */, AA7C8B8B0B67460600FD9940 /* libtomcrypt.a */, AAA070A90CE7B0DF005A3060 /* libmad.a */, + 2BBF97C6139327A800D950F6 /* libglew.a */, ); name = Products; sourceTree = ""; @@ -5033,6 +5049,13 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 2BBF97C2139327A800D950F6 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; AA29CC270558741A00961A51 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -5578,6 +5601,23 @@ /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ + 2BBF97C5139327A800D950F6 /* glew */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2BBF97CB139327DE00D950F6 /* Build configuration list for PBXNativeTarget "glew" */; + buildPhases = ( + 2BBF97C2139327A800D950F6 /* Headers */, + 2BBF97C3139327A800D950F6 /* Sources */, + 2BBF97C4139327A800D950F6 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = glew; + productName = glew; + productReference = 2BBF97C6139327A800D950F6 /* libglew.a */; + productType = "com.apple.product-type.library.static"; + }; AA29CC240558741A00961A51 /* stepmania */ = { isa = PBXNativeTarget; buildConfigurationList = AAC8450F0856A19700A9FEAB /* Build configuration list for PBXNativeTarget "stepmania" */; @@ -5593,6 +5633,7 @@ buildRules = ( ); dependencies = ( + 2BBF97CE139327FC00D950F6 /* PBXTargetDependency */, AAE781FE0AC7E61900AEFC64 /* PBXTargetDependency */, AA7C8D180B6748B800FD9940 /* PBXTargetDependency */, AA7C8D160B6748B800FD9940 /* PBXTargetDependency */, @@ -5769,6 +5810,7 @@ AA7C895E0B67444700FD9940 /* tommath */, AA7C8B8A0B67460600FD9940 /* tomcrypt */, AAA070A80CE7B0DF005A3060 /* mad */, + 2BBF97C5139327A800D950F6 /* glew */, ); }; /* End PBXProject section */ @@ -5898,6 +5940,14 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 2BBF97C3139327A800D950F6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2BBF97CC139327F300D950F6 /* glew.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; AA29CD410558741A00961A51 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6304,7 +6354,6 @@ 2B30D6821315EA7E00044B68 /* MouseDevice.cpp in Sources */, EE879B60132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp in Sources */, EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */, - EE879BC3132E06C50078FDDC /* glew.c in Sources */, 2B76698C132FF71500586512 /* NotesLoaderSMA.cpp in Sources */, 2BD06FF1137242680018CB9F /* json_reader.cpp in Sources */, 2BD06FF2137242680018CB9F /* json_value.cpp in Sources */, @@ -7078,6 +7127,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 2BBF97CE139327FC00D950F6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 2BBF97C5139327A800D950F6 /* glew */; + targetProxy = 2BBF97CD139327FC00D950F6 /* PBXContainerItemProxy */; + }; AA30C61A07F5E2EF0066F398 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = AA30C60F07F5E24A0066F398 /* version */; @@ -7162,6 +7216,113 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 2BBF97C7139327A800D950F6 /* Native */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = ""; + GCC_PREFIX_HEADER = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; + HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; + INSTALL_PATH = /usr/local/lib; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = glew; + }; + name = Native; + }; + 2BBF97C8139327A800D950F6 /* PerformanceDebug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = ""; + GCC_PREFIX_HEADER = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; + HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; + INSTALL_PATH = /usr/local/lib; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = glew; + }; + name = PerformanceDebug; + }; + 2BBF97C9139327A800D950F6 /* Universal */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = ""; + GCC_PREFIX_HEADER = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; + HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; + INSTALL_PATH = /usr/local/lib; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = glew; + }; + name = Universal; + }; + 2BBF97CA139327A800D950F6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = ""; + GCC_PREFIX_HEADER = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_PROTOTYPE_CONVERSION = NO; + GCC_WARN_SHADOW = NO; + HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; + INSTALL_PATH = /usr/local/lib; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = glew; + }; + name = Debug; + }; AA0AA8FE0963CF7700427F4D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8423,6 +8584,17 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 2BBF97CB139327DE00D950F6 /* Build configuration list for PBXNativeTarget "glew" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2BBF97C7139327A800D950F6 /* Native */, + 2BBF97C8139327A800D950F6 /* PerformanceDebug */, + 2BBF97C9139327A800D950F6 /* Universal */, + 2BBF97CA139327A800D950F6 /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Native; + }; AA40D52709A08D650068C0D5 /* Build configuration list for PBXNativeTarget "stepmania-bare" */ = { isa = XCConfigurationList; buildConfigurations = ( From 8164ddeafb668ce8ac4e839573862de614b95d2a Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Mon, 30 May 2011 09:52:49 +0700 Subject: [PATCH 08/14] probably that's where it's hidden. --- Xcode/stepmania.xcodeproj/project.pbxproj | 2 +- src/archutils/Darwin/StepMania.pch | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index ea50c39725..774ecf7789 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -1684,7 +1684,7 @@ isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; - remoteGlobalIDString = 2BBF97C5139327A800D950F6 /* glew */; + remoteGlobalIDString = 2BBF97C5139327A800D950F6; remoteInfo = glew; }; AA30C61907F5E2EF0066F398 /* PBXContainerItemProxy */ = { diff --git a/src/archutils/Darwin/StepMania.pch b/src/archutils/Darwin/StepMania.pch index acd1dc4388..b9e8479d90 100644 --- a/src/archutils/Darwin/StepMania.pch +++ b/src/archutils/Darwin/StepMania.pch @@ -6,5 +6,6 @@ #endif #ifdef __OBJC__ +# import # import #endif From b1f990c0f198aad87ea78aab2eef4d9b9c439026 Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Mon, 30 May 2011 10:39:50 +0700 Subject: [PATCH 09/14] move glew.c inside stepmania (now builds!) --- Xcode/stepmania.xcodeproj/project.pbxproj | 17 ++--------------- .../LowLevelWindow/LowLevelWindow_MacOSX.mm | 6 ++---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 774ecf7789..d399f6e0cf 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */; }; 2BA792601304F20D002BD8E1 /* NotesWriterSSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */; }; 2BA792611304F20D002BD8E1 /* NotesWriterSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */; }; - 2BBF97CC139327F300D950F6 /* glew.c in Sources */ = {isa = PBXBuildFile; fileRef = EE879BAA132E06C50078FDDC /* glew.c */; }; 2BC6132413773C8E00CC8BBD /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BC6130D13773C8E00CC8BBD /* png.c */; }; 2BC6132513773C8E00CC8BBD /* png.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BC6130E13773C8E00CC8BBD /* png.h */; }; 2BC6132613773C8E00CC8BBD /* pngconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BC6130F13773C8E00CC8BBD /* pngconf.h */; }; @@ -1660,6 +1659,7 @@ AAFF41A60F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = AAFF41A20F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.h */; }; B75CE3B5137963350076A82D /* SongPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = B75CE3B3137963350076A82D /* SongPosition.h */; }; B75CE3B6137963350076A82D /* SongPosition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B75CE3B4137963350076A82D /* SongPosition.cpp */; }; + B7B0914B1393481B00C33E6B /* glew.c in Sources */ = {isa = PBXBuildFile; fileRef = EE879BAA132E06C50078FDDC /* glew.c */; }; EE2153A910A75BEE0074B01B /* NotesLoaderPMS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */; }; EE2153AA10A75BEE0074B01B /* NotesLoaderPMS.h in Headers */ = {isa = PBXBuildFile; fileRef = EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */; }; EE879B60132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE879B5C132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp */; }; @@ -1680,13 +1680,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 2BBF97CD139327FC00D950F6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 2BBF97C5139327A800D950F6; - remoteInfo = glew; - }; AA30C61907F5E2EF0066F398 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -5633,7 +5626,6 @@ buildRules = ( ); dependencies = ( - 2BBF97CE139327FC00D950F6 /* PBXTargetDependency */, AAE781FE0AC7E61900AEFC64 /* PBXTargetDependency */, AA7C8D180B6748B800FD9940 /* PBXTargetDependency */, AA7C8D160B6748B800FD9940 /* PBXTargetDependency */, @@ -5944,7 +5936,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2BBF97CC139327F300D950F6 /* glew.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6376,6 +6367,7 @@ B75CE3B6137963350076A82D /* SongPosition.cpp in Sources */, 2B9C2E8D137A138B004C92F3 /* NotesLoaderJson.cpp in Sources */, 2B9C2E8F137A138B004C92F3 /* NotesWriterJson.cpp in Sources */, + B7B0914B1393481B00C33E6B /* glew.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7127,11 +7119,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 2BBF97CE139327FC00D950F6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 2BBF97C5139327A800D950F6 /* glew */; - targetProxy = 2BBF97CD139327FC00D950F6 /* PBXContainerItemProxy */; - }; AA30C61A07F5E2EF0066F398 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = AA30C60F07F5E24A0066F398 /* version */; diff --git a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm index 063bb84cad..4f62898020 100644 --- a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm +++ b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm @@ -428,8 +428,7 @@ RString LowLevelWindow_MacOSX::TryVideoMode( const VideoModeParams& p, bool& new if( bChangeVsync ) { - long swap = p.vsync ? 1 : 0; - + GLint swap = p.vsync ? 1 : 0; [m_Context setValues:&swap forParameter:NSOpenGLCPSwapInterval]; m_CurrentParams.vsync = p.vsync; } @@ -515,8 +514,7 @@ void LowLevelWindow_MacOSX::SetActualParamsFromMode( CFDictionaryRef mode ) if( !m_CurrentParams.windowed ) { - long swap; - + GLint swap; m_CurrentParams.width = CGDisplayPixelsWide( kCGDirectMainDisplay ); m_CurrentParams.height = CGDisplayPixelsHigh( kCGDirectMainDisplay ); CGLGetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, &swap ); From 5d3dd2820d1d7e74235bdcf569cf9cc3f9ef7316 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 30 May 2011 00:56:09 -0400 Subject: [PATCH 10/14] [tiger] Force glew to come before OpenGL. Sorry shakesoda, but we had no choice here. --- src/archutils/Darwin/StepMania.pch | 1 + 1 file changed, 1 insertion(+) diff --git a/src/archutils/Darwin/StepMania.pch b/src/archutils/Darwin/StepMania.pch index b9e8479d90..5a11b6b8ea 100644 --- a/src/archutils/Darwin/StepMania.pch +++ b/src/archutils/Darwin/StepMania.pch @@ -6,6 +6,7 @@ #endif #ifdef __OBJC__ +// Cocoa includes OpenGL from Mac OS X 10.5 onward. # import # import #endif From b42eb482bfd715e7b750e7906fed33b62434aa14 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 30 May 2011 02:23:16 -0400 Subject: [PATCH 11/14] [tiger] Don't need these parts. Also had to move glew up to for early compilation. --- Xcode/stepmania.xcodeproj/project.pbxproj | 2 +- src/archutils/Darwin/StepMania.pch | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index d399f6e0cf..86e6cf4579 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -5943,6 +5943,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + B7B0914B1393481B00C33E6B /* glew.c in Sources */, AA29CD520558741A00961A51 /* RageUtil.cpp in Sources */, AA29CD420558741A00961A51 /* RageBitmapTexture.cpp in Sources */, AA29CD430558741A00961A51 /* RageDisplay.cpp in Sources */, @@ -6367,7 +6368,6 @@ B75CE3B6137963350076A82D /* SongPosition.cpp in Sources */, 2B9C2E8D137A138B004C92F3 /* NotesLoaderJson.cpp in Sources */, 2B9C2E8F137A138B004C92F3 /* NotesWriterJson.cpp in Sources */, - B7B0914B1393481B00C33E6B /* glew.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/archutils/Darwin/StepMania.pch b/src/archutils/Darwin/StepMania.pch index 5a11b6b8ea..7d2d90ecb3 100644 --- a/src/archutils/Darwin/StepMania.pch +++ b/src/archutils/Darwin/StepMania.pch @@ -4,9 +4,3 @@ #ifdef __cplusplus # include "global.h" #endif - -#ifdef __OBJC__ -// Cocoa includes OpenGL from Mac OS X 10.5 onward. -# import -# import -#endif From f686951513ef65a3d5bfa036f2a43a845beb7f22 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 30 May 2011 10:40:00 -0400 Subject: [PATCH 12/14] [tiger] Universal binaries work. Thanks to the #gcc channel in getting GCC 4.2 to work. --- Xcode/stepmania.xcodeproj/project.pbxproj | 16 ++++++++-------- src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h | 2 -- src/archutils/Darwin/DarwinThreadHelpers.cpp | 4 ++-- src/archutils/Unix/Backtrace.cpp | 5 +++++ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 86e6cf4579..3b393aab10 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -7434,8 +7434,8 @@ PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; SDKROOT = macosx10.5; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; + SDKROOT_i386 = ""; + SDKROOT_ppc = ""; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = "non-global"; @@ -8011,8 +8011,8 @@ PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; SDKROOT = macosx10.5; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; + SDKROOT_i386 = ""; + SDKROOT_ppc = ""; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = YES; STRIP_STYLE = "non-global"; @@ -8357,8 +8357,8 @@ PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; SDKROOT = macosx10.5; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; + SDKROOT_i386 = ""; + SDKROOT_ppc = ""; SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)"; STRIP_INSTALLED_PRODUCT = YES; STRIP_STYLE = "non-global"; @@ -8487,8 +8487,8 @@ PREBINDING = NO; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; SDKROOT = macosx10.5; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT_i386 = ""; + SDKROOT_ppc = ""; 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 d291a49ced..9dd1644616 100644 --- a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h +++ b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h @@ -6,8 +6,6 @@ #include 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. */ typedef uint32_t CGDirectDisplayID; class LowLevelWindow_MacOSX : public LowLevelWindow diff --git a/src/archutils/Darwin/DarwinThreadHelpers.cpp b/src/archutils/Darwin/DarwinThreadHelpers.cpp index bd88592a3a..b71a8f8c67 100644 --- a/src/archutils/Darwin/DarwinThreadHelpers.cpp +++ b/src/archutils/Darwin/DarwinThreadHelpers.cpp @@ -33,8 +33,8 @@ bool GetThreadBacktraceContext( uint64_t iID, BacktraceContext *ctx ) if( thread_get_state(thread, PPC_THREAD_STATE, thread_state_t(&state), &count) ) return false; - ctx->FramePtr = (const Frame *)state.r1; - ctx->PC = (void *)state.srr0; + ctx->FramePtr = (const Frame *)state.__r1; + ctx->PC = (void *)state.__srr0; return true; #elif defined(__i386__) i386_thread_state_t state; diff --git a/src/archutils/Unix/Backtrace.cpp b/src/archutils/Unix/Backtrace.cpp index 00c8fa64dd..60c7bc9dfc 100644 --- a/src/archutils/Unix/Backtrace.cpp +++ b/src/archutils/Unix/Backtrace.cpp @@ -635,8 +635,13 @@ struct Frame void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc ) { +#if defined(__ppc__) + ctx->PC = (const void *) uc->uc_mcontext->__ss.__srr0; + ctx->FramePtr = (const Frame *) uc->uc_mcontext->__ss.__r1; +#else ctx->PC = (const void *) uc->uc_mcontext->ss.srr0; ctx->FramePtr = (const Frame *) uc->uc_mcontext->ss.r1; +#endif } void InitializeBacktrace() { } From f4560859649d217e4bc52b7d5aa5710672d4deba Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 30 May 2011 10:43:43 -0400 Subject: [PATCH 13/14] [tiger] Never needed the glew target. --- Xcode/stepmania.xcodeproj/project.pbxproj | 159 ---------------------- 1 file changed, 159 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 3b393aab10..bda1a358b6 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -1812,7 +1812,6 @@ 2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderSSC.h; path = ../src/NotesLoaderSSC.h; sourceTree = SOURCE_ROOT; }; 2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesWriterSSC.cpp; path = ../src/NotesWriterSSC.cpp; sourceTree = SOURCE_ROOT; }; 2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesWriterSSC.h; path = ../src/NotesWriterSSC.h; sourceTree = SOURCE_ROOT; }; - 2BBF97C6139327A800D950F6 /* libglew.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libglew.a; sourceTree = BUILT_PRODUCTS_DIR; }; 2BC6130D13773C8E00CC8BBD /* png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../extern/libpng/include/png.c; sourceTree = SOURCE_ROOT; }; 2BC6130E13773C8E00CC8BBD /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = png.h; path = ../extern/libpng/include/png.h; sourceTree = SOURCE_ROOT; }; 2BC6130F13773C8E00CC8BBD /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = ../extern/libpng/include/pngconf.h; sourceTree = SOURCE_ROOT; }; @@ -3050,13 +3049,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 2BBF97C4139327A800D950F6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; AA29CE3B0558741A00961A51 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3195,7 +3187,6 @@ AA7C895F0B67444700FD9940 /* libtommath.a */, AA7C8B8B0B67460600FD9940 /* libtomcrypt.a */, AAA070A90CE7B0DF005A3060 /* libmad.a */, - 2BBF97C6139327A800D950F6 /* libglew.a */, ); name = Products; sourceTree = ""; @@ -5042,13 +5033,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 2BBF97C2139327A800D950F6 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; AA29CC270558741A00961A51 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -5594,23 +5578,6 @@ /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ - 2BBF97C5139327A800D950F6 /* glew */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2BBF97CB139327DE00D950F6 /* Build configuration list for PBXNativeTarget "glew" */; - buildPhases = ( - 2BBF97C2139327A800D950F6 /* Headers */, - 2BBF97C3139327A800D950F6 /* Sources */, - 2BBF97C4139327A800D950F6 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = glew; - productName = glew; - productReference = 2BBF97C6139327A800D950F6 /* libglew.a */; - productType = "com.apple.product-type.library.static"; - }; AA29CC240558741A00961A51 /* stepmania */ = { isa = PBXNativeTarget; buildConfigurationList = AAC8450F0856A19700A9FEAB /* Build configuration list for PBXNativeTarget "stepmania" */; @@ -5802,7 +5769,6 @@ AA7C895E0B67444700FD9940 /* tommath */, AA7C8B8A0B67460600FD9940 /* tomcrypt */, AAA070A80CE7B0DF005A3060 /* mad */, - 2BBF97C5139327A800D950F6 /* glew */, ); }; /* End PBXProject section */ @@ -5932,13 +5898,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 2BBF97C3139327A800D950F6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; AA29CD410558741A00961A51 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -7203,113 +7162,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 2BBF97C7139327A800D950F6 /* Native */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = ""; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_PROTOTYPE_CONVERSION = NO; - GCC_WARN_SHADOW = NO; - HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; - INSTALL_PATH = /usr/local/lib; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = glew; - }; - name = Native; - }; - 2BBF97C8139327A800D950F6 /* PerformanceDebug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = ""; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_PROTOTYPE_CONVERSION = NO; - GCC_WARN_SHADOW = NO; - HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; - INSTALL_PATH = /usr/local/lib; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = glew; - }; - name = PerformanceDebug; - }; - 2BBF97C9139327A800D950F6 /* Universal */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = ""; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_PROTOTYPE_CONVERSION = NO; - GCC_WARN_SHADOW = NO; - HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; - INSTALL_PATH = /usr/local/lib; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = glew; - }; - name = Universal; - }; - 2BBF97CA139327A800D950F6 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = ""; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; - GCC_WARN_PROTOTYPE_CONVERSION = NO; - GCC_WARN_SHADOW = NO; - HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include"; - INSTALL_PATH = /usr/local/lib; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = glew; - }; - name = Debug; - }; AA0AA8FE0963CF7700427F4D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8571,17 +8423,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2BBF97CB139327DE00D950F6 /* Build configuration list for PBXNativeTarget "glew" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2BBF97C7139327A800D950F6 /* Native */, - 2BBF97C8139327A800D950F6 /* PerformanceDebug */, - 2BBF97C9139327A800D950F6 /* Universal */, - 2BBF97CA139327A800D950F6 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Native; - }; AA40D52709A08D650068C0D5 /* Build configuration list for PBXNativeTarget "stepmania-bare" */ = { isa = XCConfigurationList; buildConfigurations = ( From f1fa1e279a361ee4dd0c41db83d2f642718c60e7 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 30 May 2011 11:32:04 -0400 Subject: [PATCH 14/14] [tiger] Use the suggestion. I believe and are already in global.h. --- src/archutils/Darwin/StepMania.pch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/archutils/Darwin/StepMania.pch b/src/archutils/Darwin/StepMania.pch index 7d2d90ecb3..b4d1a77da6 100644 --- a/src/archutils/Darwin/StepMania.pch +++ b/src/archutils/Darwin/StepMania.pch @@ -2,5 +2,6 @@ // Only do this for c++ files. #ifdef __cplusplus -# include "global.h" +#include "global.h" +#include #endif