diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj index eb2f071834..3ea4917452 100644 --- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 7A804DFD1A1A8EF7004D8B7F /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */; }; 7AEFCD7D192128EA00FB5B6A /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7C192128EA00FB5B6A /* utility.m */; }; 7AEFCD7F192128FE00FB5B6A /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */; }; 7AEFCD831921292900FB5B6A /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD821921292900FB5B6A /* platform.m */; }; @@ -26,6 +27,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../common/CFExtensions.m; sourceTree = SOURCE_ROOT; }; 7AEFCD7C192128EA00FB5B6A /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; }; 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; }; 7AEFCD821921292900FB5B6A /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = ../OSX/platform.m; sourceTree = SOURCE_ROOT; }; @@ -125,6 +127,7 @@ 96355CE81788E72A0010DBFA /* common */ = { isa = PBXGroup; children = ( + 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */, 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */, 7AEFCD7C192128EA00FB5B6A /* utility.m */, ); @@ -221,6 +224,7 @@ 7AEFCD831921292900FB5B6A /* platform.m in Sources */, 7AEFCD851921294100FB5B6A /* settings.m in Sources */, 7AEFCD871921295E00FB5B6A /* griffin.c in Sources */, + 7A804DFD1A1A8EF7004D8B7F /* CFExtensions.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/apple/common/apple_gfx_context.c.inl b/apple/common/apple_gfx_context.c.inl index c500f2f204..ff75d400d7 100644 --- a/apple/common/apple_gfx_context.c.inl +++ b/apple/common/apple_gfx_context.c.inl @@ -292,11 +292,13 @@ static void apple_gfx_ctx_swap_buffers(void *data) static gfx_ctx_proc_t apple_gfx_ctx_get_proc_address(const char *symbol_name) { return (gfx_ctx_proc_t)CFBundleGetFunctionPointerForName(CFBundleGetBundleWithIdentifier(GLFrameworkID), -#if defined(MAC_OS_X_VERSION_10_7) && __has_feature(objc_arc) - (__bridge CFStringRef)BOXSTRING(symbol_name) -#else - (CFStringRef)BOXSTRING(symbol_name) + ( +#if MAC_OS_X_VERSION_10_7 +#if __has_feature(objc_arc) + __bridge #endif +#endif +CFStringRef)BOXSTRING(symbol_name) ); }