diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index 3a1cb709b2..01aa7fde52 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -272,7 +272,10 @@ static char** waiting_argv; return; NSComboBox* cb = (NSComboBox*)[[self.coreSelectSheet contentView] viewWithTag:1]; +#if defined(MAC_OS_X_VERSION_10_6) + /* FIXME - Rewrite this so that this is no longer an associated object - requires ObjC 2.0 runtime */ self.core = objc_getAssociatedObject([cb objectValueOfSelectedItem], associated_core_key); +#endif [self runCore]; } diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m index a0701449dd..b6f72b3767 100644 --- a/apple/OSX/settings.m +++ b/apple/OSX/settings.m @@ -220,7 +220,12 @@ NSWindowDelegate> - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { +#if defined(MAC_OS_X_VERSION_10_6) return objc_getAssociatedObject([self.settings objectAtIndex:row], associated_name_tag); +#else + /* FIXME - Rewrite this so that this is no longer an associated object - requires ObjC 2.0 runtime */ + return 0; /* stub */ +#endif } - (void)tableViewSelectionDidChange:(NSNotification *)aNotification @@ -257,9 +262,12 @@ NSWindowDelegate> if ([item isKindOfClass:[NSArray class]]) { +#ifdef MAC_OS_X_VERSION_10_6 + /* FIXME - Rewrite this so that this is no longer an associated object - requires ObjC 2.0 runtime */ if ([[tableColumn identifier] isEqualToString:@"left"]) return objc_getAssociatedObject(item, associated_name_tag); else +#endif return @""; } else diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj b/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj index 1fb36f1f1f..8cfa06c97e 100644 --- a/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj @@ -298,7 +298,9 @@ "-DWANT_MINIZ,", "-DHAVE_ZLIB,", "-DRARCH_INTERNAL,", - "-DOSX", + "-DOSX,", + "-DHAVE_GLSL,", + "-DHAVE_RGUI", ); PREBINDING = NO; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; @@ -323,7 +325,9 @@ "-DWANT_MINIZ,", "-DHAVE_ZLIB,", "-DRARCH_INTERNAL,", - "-DOSX", + "-DOSX,", + "-DHAVE_GLSL,", + "-DHAVE_RGUI", ); PREBINDING = NO; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree index abf34cbbe0..a93db3d5d2 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree index 115e8697bc..7b7f181b16 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree index 4ce555e141..b0ffafd9b6 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header index 0e45f2edc3..f2a39a2b26 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree index b98a7b9d2d..4032a72e5c 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control index 60218abd82..35044d5215 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols index 648dfa6d7f..0ea7398b0e 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols differ