mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Omit HAVE_AVFOUNDATION for OSX port right now

Browse Source
This commit is contained in:
Twinaphex 2015-03-31 03:26:23 +02:00
parent b7ba8e7d58
commit d19eddccb9
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apple/RetroArch_OSX.xcodeproj/project.pbxproj
View File

@ -19,7 +19,6 @@
841CBB8E1A8A34920066E9F1 /* assets in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB731A8A308C0066E9F1 /* assets */; }; 841CBB8E1A8A34920066E9F1 /* assets in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB731A8A308C0066E9F1 /* assets */; };
84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */; }; 84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */; };
84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; 84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
84DD5EA51A89E2F6007336C1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */; };
84DD5EA71A89E406007336C1 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA61A89E406007336C1 /* CoreLocation.framework */; }; 84DD5EA71A89E406007336C1 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA61A89E406007336C1 /* CoreLocation.framework */; };
84DD5EA91A89E4BE007336C1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */; }; 84DD5EA91A89E4BE007336C1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */; };
84DD5EAB1A89E534007336C1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EAA1A89E534007336C1 /* CoreMedia.framework */; }; 84DD5EAB1A89E534007336C1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EAA1A89E534007336C1 /* CoreMedia.framework */; };
@ -73,7 +72,6 @@
841CBB7D1A8A314F0066E9F1 /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cursors; path = ../media/libretrodb/cursors; sourceTree = "<group>"; }; 841CBB7D1A8A314F0066E9F1 /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cursors; path = ../media/libretrodb/cursors; sourceTree = "<group>"; };
841CBB7F1A8A31650066E9F1 /* rdb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rdb; path = ../media/libretrodb/rdb; sourceTree = "<group>"; }; 841CBB7F1A8A31650066E9F1 /* rdb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rdb; path = ../media/libretrodb/rdb; sourceTree = "<group>"; };
84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = "<absolute>"; }; 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = "<absolute>"; };
84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = /System/Library/Frameworks/AVFoundation.framework; sourceTree = "<absolute>"; };
84DD5EA61A89E406007336C1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = /System/Library/Frameworks/CoreLocation.framework; sourceTree = "<absolute>"; }; 84DD5EA61A89E406007336C1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = /System/Library/Frameworks/CoreLocation.framework; sourceTree = "<absolute>"; };
84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; }; 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
84DD5EAA1A89E534007336C1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = /System/Library/Frameworks/CoreMedia.framework; sourceTree = "<absolute>"; }; 84DD5EAA1A89E534007336C1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = /System/Library/Frameworks/CoreMedia.framework; sourceTree = "<absolute>"; };
@ -95,7 +93,6 @@
84DD5EB31A89E6C0007336C1 /* AudioUnit.framework in Frameworks */, 84DD5EB31A89E6C0007336C1 /* AudioUnit.framework in Frameworks */,
84DD5EB61A89E76C007336C1 /* Cg.framework in Frameworks */, 84DD5EB61A89E76C007336C1 /* Cg.framework in Frameworks */,
84DD5EAD1A89E5B4007336C1 /* OpenGL.framework in Frameworks */, 84DD5EAD1A89E5B4007336C1 /* OpenGL.framework in Frameworks */,
84DD5EA51A89E2F6007336C1 /* AVFoundation.framework in Frameworks */,
84DD5EA71A89E406007336C1 /* CoreLocation.framework in Frameworks */, 84DD5EA71A89E406007336C1 /* CoreLocation.framework in Frameworks */,
84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */, 84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */,
84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */, 84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */,
@ -124,7 +121,6 @@
84DD5EAA1A89E534007336C1 /* CoreMedia.framework */, 84DD5EAA1A89E534007336C1 /* CoreMedia.framework */,
84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */, 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */,
84DD5EA61A89E406007336C1 /* CoreLocation.framework */, 84DD5EA61A89E406007336C1 /* CoreLocation.framework */,
84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */,
84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */, 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */,
29B97324FDCFA39411CA2CEA /* AppKit.framework */, 29B97324FDCFA39411CA2CEA /* AppKit.framework */,
); );

11
apple/common/RAGameView.m
View File

@ -22,7 +22,12 @@
/* Define compatibility symbols and categories. */ /* Define compatibility symbols and categories. */
#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) //#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0)
#if defined(__IPHONE_4_0) && defined(IOS)
#define HAVE_AVFOUNDATION
#endif
#ifdef HAVE_AVFOUNDATION
#include <AVFoundation/AVCaptureSession.h> #include <AVFoundation/AVCaptureSession.h>
#include <AVFoundation/AVCaptureDevice.h> #include <AVFoundation/AVCaptureDevice.h>
#include <AVFoundation/AVCaptureOutput.h> #include <AVFoundation/AVCaptureOutput.h>
@ -178,7 +183,7 @@ static void apple_gfx_ctx_update(void);
#endif #endif
#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) #ifdef HAVE_AVFOUNDATION
#include "contentview_camera_ios.m.inl" #include "contentview_camera_ios.m.inl"
#endif #endif
@ -188,7 +193,7 @@ static void apple_gfx_ctx_update(void);
@end @end
#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) #ifdef HAVE_AVFOUNDATION
#include "apple_camera_ios.c.inl" #include "apple_camera_ios.c.inl"
#endif #endif

23
apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj
View File

@ -331,6 +331,9 @@
LastUpgradeCheck = 0450; LastUpgradeCheck = 0450;
ORGANIZATIONNAME = RetroArch; ORGANIZATIONNAME = RetroArch;
TargetAttributes = { TargetAttributes = {
503700861ACA18E400A51A37 = {
DevelopmentTeam = YLQUB5DVUQ;
};
96AFAE2416C1D4EA009DE44C = { 96AFAE2416C1D4EA009DE44C = {
DevelopmentTeam = YLQUB5DVUQ; DevelopmentTeam = YLQUB5DVUQ;
}; };
@ -470,8 +473,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
@ -518,6 +521,7 @@
"-D_LZMA_UINT32_IS_ULONG", "-D_LZMA_UINT32_IS_ULONG",
); );
PRODUCT_NAME = "RetroArch copy"; PRODUCT_NAME = "RetroArch copy";
PROVISIONING_PROFILE = "";
VALID_ARCHS = armv7; VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
@ -530,8 +534,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
@ -615,6 +619,7 @@
"-D_LZMA_UINT32_IS_ULONG", "-D_LZMA_UINT32_IS_ULONG",
); );
PRODUCT_NAME = "RetroArch copy"; PRODUCT_NAME = "RetroArch copy";
PROVISIONING_PROFILE = "";
VALID_ARCHS = armv7; VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
@ -747,8 +752,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
@ -796,6 +801,7 @@
"-DHAVE_MFI", "-DHAVE_MFI",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
VALID_ARCHS = armv7; VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
@ -808,8 +814,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
@ -895,6 +901,7 @@
"-DHAVE_MFI", "-DHAVE_MFI",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
VALID_ARCHS = armv7; VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };

4
camera/camera_driver.c
View File

@ -31,8 +31,8 @@ static const camera_driver_t *camera_drivers[] = {
#ifdef ANDROID #ifdef ANDROID
&camera_android, &camera_android,
#endif #endif
#if defined(MAC_OS_X_VERSION_10_7) || defined(__IPHONE_4_0) #if defined(__IPHONE_4_0) && defined(IOS)
&camera_apple, &camera_apple,
#endif #endif
&camera_null, &camera_null,
NULL, NULL,