diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj index 1e35838adb..00c79ce53b 100644 --- a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj @@ -11,9 +11,6 @@ 50351E7F192E5EC100668AB1 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7E192E5EC100668AB1 /* platform.m */; }; 50535530185E0F4000926C26 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5053552F185E0F4000926C26 /* CoreLocation.framework */; }; 50C374A919F04F7A00984F8D /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50C374A819F04F7A00984F8D /* CFExtensions.m */; }; - 50C61C251A1BB10300A48DD3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C61C241A1BB10300A48DD3 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 50C61C271A1BB11D00A48DD3 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C61C261A1BB11D00A48DD3 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 50C61C291A1BB12F00A48DD3 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C61C281A1BB12F00A48DD3 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 50D66298199F344700CF54E3 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D66297199F344700CF54E3 /* Cg.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 962EE0E1178B3DF6004224FF /* IOKit.framework */; }; 96355CE31788E72A0010DBFA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96355CE21788E72A0010DBFA /* Cocoa.framework */; }; @@ -69,9 +66,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 50C61C291A1BB12F00A48DD3 /* CoreVideo.framework in Frameworks */, - 50C61C271A1BB11D00A48DD3 /* CoreMedia.framework in Frameworks */, - 50C61C251A1BB10300A48DD3 /* AVFoundation.framework in Frameworks */, 50D66298199F344700CF54E3 /* Cg.framework in Frameworks */, 50535530185E0F4000926C26 /* CoreLocation.framework in Frameworks */, 962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */, diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m index 45ad77160e..ad766de928 100644 --- a/apple/common/RAGameView.m +++ b/apple/common/RAGameView.m @@ -20,7 +20,7 @@ /* Define compatibility symbols and categories. */ -#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_3_0) +#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) #include #include #include @@ -176,7 +176,7 @@ static void apple_gfx_ctx_update(void); #endif -#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_3_0) +#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) #include "contentview_camera_ios.m.inl" #endif @@ -186,7 +186,7 @@ static void apple_gfx_ctx_update(void); @end -#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_3_0) +#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) #include "apple_camera_ios.c.inl" #endif diff --git a/config.def.h b/config.def.h index 433cdc6a1d..3a1b513891 100644 --- a/config.def.h +++ b/config.def.h @@ -275,7 +275,7 @@ enum #define CAMERA_DEFAULT_DRIVER CAMERA_RWEBCAM #elif defined(ANDROID) #define CAMERA_DEFAULT_DRIVER CAMERA_ANDROID -#elif defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_3_0) +#elif defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) #define CAMERA_DEFAULT_DRIVER CAMERA_APPLE #else #define CAMERA_DEFAULT_DRIVER CAMERA_NULL