diff --git a/apple/iOS/RetroArch copy-Info.plist b/apple/iOS/RetroArch copy-Info.plist new file mode 100644 index 0000000000..2d3ca64df5 --- /dev/null +++ b/apple/iOS/RetroArch copy-Info.plist @@ -0,0 +1,70 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + RetroArch + CFBundleDocumentTypes + + + CFBundleTypeName + All Files + LSItemContentTypes + + public.data + public.content + + + + CFBundleExecutable + RetroArch + CFBundleIcons + + CFBundleIcons~ipad + + CFBundleIdentifier + com.libretro.RetroArch + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + RetroArch + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.1.0 + LSRequiresIPhoneOS + + UIApplicationExitsOnSuspend + + UIFileSharingEnabled + + UIRequiredDeviceCapabilities + + armv7 + + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortraitUpsideDown + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 2c602bb70d..f8595b5009 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -12,6 +12,36 @@ 501232CE192E5FE30063A359 /* audio_utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* audio_utils_neon.S */; }; 501881EC184BAD6D006F665D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881EB184BAD6D006F665D /* AVFoundation.framework */; }; 501881EE184BB54C006F665D /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881ED184BB54C006F665D /* CoreMedia.framework */; }; + 503700881ACA18E400A51A37 /* cc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */; }; + 503700891ACA18E400A51A37 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; + 5037008A1ACA18E400A51A37 /* audio_utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* audio_utils_neon.S */; }; + 5037008B1ACA18E400A51A37 /* sinc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_neon.S */; }; + 5037008C1ACA18E400A51A37 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; + 5037008E1ACA18E400A51A37 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; + 503700901ACA18E400A51A37 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 696012F119F3389A006A1088 /* CoreText.framework */; }; + 503700911ACA18E400A51A37 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */; }; + 503700921ACA18E400A51A37 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881ED184BB54C006F665D /* CoreMedia.framework */; }; + 503700931ACA18E400A51A37 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881EB184BAD6D006F665D /* AVFoundation.framework */; }; + 503700941ACA18E400A51A37 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E7189E184B88AA001956CE /* CoreVideo.framework */; }; + 503700951ACA18E400A51A37 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96366C5816C9ACF500D64A22 /* AudioToolbox.framework */; }; + 503700961ACA18E400A51A37 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96366C5416C9AC3300D64A22 /* CoreAudio.framework */; }; + 503700971ACA18E400A51A37 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2916C1D4EA009DE44C /* UIKit.framework */; }; + 503700981ACA18E400A51A37 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2B16C1D4EA009DE44C /* Foundation.framework */; }; + 503700991ACA18E400A51A37 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2D16C1D4EA009DE44C /* CoreGraphics.framework */; }; + 5037009A1ACA18E400A51A37 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2F16C1D4EA009DE44C /* GLKit.framework */; }; + 5037009B1ACA18E400A51A37 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE3116C1D4EA009DE44C /* OpenGLES.framework */; }; + 5037009E1ACA18E400A51A37 /* shaders_glsl in Resources */ = {isa = PBXBuildFile; fileRef = 84FD66AD1AB530B20074AC3A /* shaders_glsl */; }; + 5037009F1ACA18E400A51A37 /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DB19ECFCC4009E3161 /* ic_pause.png */; }; + 503700A01ACA18E400A51A37 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 967894611788EBD800D6CA69 /* InfoPlist.strings */; }; + 503700A11ACA18E400A51A37 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 69D31DE31A547EC800EF4C92 /* Media.xcassets */; }; + 503700A21ACA18E400A51A37 /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DE19ECFCC4009E3161 /* PauseIndicatorView.xib */; }; + 503700A31ACA18E400A51A37 /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 83EB675F19EEAF050096F441 /* modules */; }; + 503700A41ACA18E400A51A37 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9BB1A87E068003AF12F /* assets */; }; + 503700A51ACA18E400A51A37 /* autoconfig in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9BD1A87E0A2003AF12F /* autoconfig */; }; + 503700A61ACA18E400A51A37 /* overlays in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9BF1A87E0C6003AF12F /* overlays */; }; + 503700A71ACA18E400A51A37 /* cht in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9C11A87E180003AF12F /* cht */; }; + 503700A81ACA18E400A51A37 /* cursors in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9C41A87E1D0003AF12F /* cursors */; }; + 503700A91ACA18E400A51A37 /* rdb in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9C61A87E1E8003AF12F /* rdb */; }; 5041BAF41A9D40D000A77A33 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963C3C33186E3DED00A6EB1E /* GameController.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 50521A441AA23BF500185CC9 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; 50C3B1AE1AB1107200F478D3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; @@ -46,6 +76,8 @@ 501232CD192E5FE30063A359 /* audio_utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = audio_utils_neon.S; path = ../../audio/audio_utils_neon.S; sourceTree = SOURCE_ROOT; }; 501881EB184BAD6D006F665D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 501881ED184BB54C006F665D /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 503700AD1ACA18E400A51A37 /* RetroArch copy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RetroArch copy.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 503700AE1ACA18E400A51A37 /* RetroArch copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "RetroArch copy-Info.plist"; path = "/Users/squarepusher/libretro-super/retroarch/apple/iOS/RetroArch copy-Info.plist"; sourceTree = ""; }; 50521A431AA23BF500185CC9 /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../../griffin/griffin_objc.m; sourceTree = ""; }; 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; @@ -79,6 +111,26 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 5037008D1ACA18E400A51A37 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 5037008E1ACA18E400A51A37 /* QuartzCore.framework in Frameworks */, + 503700901ACA18E400A51A37 /* CoreText.framework in Frameworks */, + 503700911ACA18E400A51A37 /* CoreLocation.framework in Frameworks */, + 503700921ACA18E400A51A37 /* CoreMedia.framework in Frameworks */, + 503700931ACA18E400A51A37 /* AVFoundation.framework in Frameworks */, + 503700941ACA18E400A51A37 /* CoreVideo.framework in Frameworks */, + 503700951ACA18E400A51A37 /* AudioToolbox.framework in Frameworks */, + 503700961ACA18E400A51A37 /* CoreAudio.framework in Frameworks */, + 503700971ACA18E400A51A37 /* UIKit.framework in Frameworks */, + 503700981ACA18E400A51A37 /* Foundation.framework in Frameworks */, + 503700991ACA18E400A51A37 /* CoreGraphics.framework in Frameworks */, + 5037009A1ACA18E400A51A37 /* GLKit.framework in Frameworks */, + 5037009B1ACA18E400A51A37 /* OpenGLES.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 96AFAE2216C1D4EA009DE44C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -139,6 +191,7 @@ 96AFAE2816C1D4EA009DE44C /* Frameworks */, 96AFAE2616C1D4EA009DE44C /* Products */, 96AFAE3416C1D4EA009DE44C /* Supporting Files */, + 503700AE1ACA18E400A51A37 /* RetroArch copy-Info.plist */, ); indentWidth = 3; sourceTree = ""; @@ -148,6 +201,7 @@ isa = PBXGroup; children = ( 96AFAE2516C1D4EA009DE44C /* RetroArch.app */, + 503700AD1ACA18E400A51A37 /* RetroArch copy.app */, ); name = Products; sourceTree = ""; @@ -232,6 +286,24 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 503700861ACA18E400A51A37 /* RetroArch iOS6 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 503700AA1ACA18E400A51A37 /* Build configuration list for PBXNativeTarget "RetroArch iOS6" */; + buildPhases = ( + 503700871ACA18E400A51A37 /* Sources */, + 5037008D1ACA18E400A51A37 /* Frameworks */, + 5037009C1ACA18E400A51A37 /* ShellScript */, + 5037009D1ACA18E400A51A37 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "RetroArch iOS6"; + productName = RetroArch; + productReference = 503700AD1ACA18E400A51A37 /* RetroArch copy.app */; + productType = "com.apple.product-type.application"; + }; 96AFAE2416C1D4EA009DE44C /* RetroArch */ = { isa = PBXNativeTarget; buildConfigurationList = 96AFAE5416C1D4EA009DE44C /* Build configuration list for PBXNativeTarget "RetroArch" */; @@ -277,11 +349,31 @@ projectRoot = ""; targets = ( 96AFAE2416C1D4EA009DE44C /* RetroArch */, + 503700861ACA18E400A51A37 /* RetroArch iOS6 */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 5037009D1ACA18E400A51A37 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5037009E1ACA18E400A51A37 /* shaders_glsl in Resources */, + 5037009F1ACA18E400A51A37 /* ic_pause.png in Resources */, + 503700A01ACA18E400A51A37 /* InfoPlist.strings in Resources */, + 503700A11ACA18E400A51A37 /* Media.xcassets in Resources */, + 503700A21ACA18E400A51A37 /* PauseIndicatorView.xib in Resources */, + 503700A31ACA18E400A51A37 /* modules in Resources */, + 503700A41ACA18E400A51A37 /* assets in Resources */, + 503700A51ACA18E400A51A37 /* autoconfig in Resources */, + 503700A61ACA18E400A51A37 /* overlays in Resources */, + 503700A71ACA18E400A51A37 /* cht in Resources */, + 503700A81ACA18E400A51A37 /* cursors in Resources */, + 503700A91ACA18E400A51A37 /* rdb in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 96AFAE2316C1D4EA009DE44C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -304,6 +396,19 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 5037009C1ACA18E400A51A37 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd ../..\n\necho \"=== GLSL shaders\"\nmkdir -p \"media/shaders_glsl\"\nfor a in \"python3.4\" \"python3.3\" \"python3.2\" \"python3.1\" \"python3\" \"python\"; do\n echo -n \"Checking for $a... \"\n if command -v $a > /dev/null; then\n echo \"yes.\"\n make -f Makefile.griffin PYTHON3=$a shaders-convert-glsl\n break\n else\n echo \"no.\"\n fi\ndone"; + }; 84FD66AC1AB520100074AC3A /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -320,6 +425,18 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 503700871ACA18E400A51A37 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 503700881ACA18E400A51A37 /* cc_resampler_neon.S in Sources */, + 503700891ACA18E400A51A37 /* griffin_objc.m in Sources */, + 5037008A1ACA18E400A51A37 /* audio_utils_neon.S in Sources */, + 5037008B1ACA18E400A51A37 /* sinc_neon.S in Sources */, + 5037008C1ACA18E400A51A37 /* griffin.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 96AFAE2116C1D4EA009DE44C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -346,6 +463,171 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 503700AB1ACA18E400A51A37 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + armv7s, + armv7, + ); + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_CXX_LIBRARY = "libstdc++"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = ""; + HEADER_SEARCH_PATHS = ( + ../, + "../../libretro-common/include", + ../../, + ); + INFOPLIST_FILE = "RetroArch copy-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LD_NO_PIE = YES; + LIBRARY_SEARCH_PATHS = ""; + ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ( + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", + "-DHAVE_CAMERA", + "-DHAVE_GRIFFIN", + "-DHAVE_LOCATION", + "-DHAVE_RGUI", + "-DHAVE_MENU", + "-DHAVE_LIBRETRODB", + "-DIOS", + "-DHAVE_OPENGL", + "-DHAVE_FBO", + "-DHAVE_OPENGLES", + "-DHAVE_OPENGLES2", + "-DHAVE_GLSL", + "-DINLINE=inline", + "-DLSB_FIRST", + "-D__LIBRETRO__", + "-DRARCH_MOBILE", + "-DHAVE_COREAUDIO", + "-DHAVE_DYNAMIC", + "-DHAVE_OVERLAY", + "-DHAVE_ZLIB", + "-DWANT_ZLIB", + "-DSINC_LOWER_QUALITY", + "-DRARCH_INTERNAL", + "-DHAVE_THREADS", + "-DHAVE_FILTERS_BUILTIN", + "-DHAVE_GLUI", + "-DHAVE_XMB", + "-D_LZMA_UINT32_IS_ULONG", + ); + PRODUCT_NAME = "RetroArch copy"; + PROVISIONING_PROFILE = ""; + VALID_ARCHS = "armv7 armv7s"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + 503700AC1ACA18E400A51A37 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + armv7s, + armv7, + ); + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_CXX_LIBRARY = "libstdc++"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = ""; + HEADER_SEARCH_PATHS = ( + ../, + "../../libretro-common/include", + ../../, + ); + INFOPLIST_FILE = "RetroArch copy-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LD_NO_PIE = YES; + LIBRARY_SEARCH_PATHS = ""; + OTHER_CFLAGS = ( + "-DNS_BLOCK_ASSERTIONS=1", + "-DNDEBUG", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", + "-DHAVE_CAMERA", + "-DHAVE_GRIFFIN", + "-DHAVE_LOCATION", + "-DHAVE_RGUI", + "-DHAVE_MENU", + "-DHAVE_LIBRETRODB", + "-DIOS", + "-DHAVE_OPENGL", + "-DHAVE_FBO", + "-DHAVE_OPENGLES", + "-DHAVE_OPENGLES2", + "-DHAVE_GLSL", + "-DINLINE=inline", + "-DLSB_FIRST", + "-D__LIBRETRO__", + "-DRARCH_MOBILE", + "-DHAVE_COREAUDIO", + "-DHAVE_DYNAMIC", + "-DHAVE_OVERLAY", + "-DHAVE_ZLIB", + "-DWANT_ZLIB", + "-DSINC_LOWER_QUALITY", + "-DRARCH_INTERNAL", + "-DHAVE_THREADS", + "-DHAVE_FILTERS_BUILTIN", + "-DHAVE_7ZIP", + "-DHAVE_GLUI", + "-DHAVE_XMB", + "-D_LZMA_UINT32_IS_ULONG", + ); + "OTHER_CFLAGS[arch=*]" = ( + "-DNS_BLOCK_ASSERTIONS=1", + "-DNDEBUG", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", + "-DHAVE_CAMERA", + "-DHAVE_GRIFFIN", + "-DHAVE_LOCATION", + "-DHAVE_RGUI", + "-DHAVE_MENU", + "-DHAVE_LIBRETRODB", + "-DIOS", + "-DHAVE_OPENGL", + "-DHAVE_FBO", + "-DHAVE_OPENGLES", + "-DHAVE_OPENGLES2", + "-DHAVE_GLSL", + "-DINLINE=inline", + "-DLSB_FIRST", + "-D__LIBRETRO__", + "-DRARCH_MOBILE", + "-DHAVE_COREAUDIO", + "-DHAVE_DYNAMIC", + "-DRARCH_INTERNAL", + "-DHAVE_OVERLAY", + "-DHAVE_ZLIB", + "-DWANT_ZLIB", + "-DSINC_LOWER_QUALITY", + "-DHAVE_THREADS", + "-DHAVE_FILTERS_BUILTIN", + "-DHAVE_7ZIP", + "-DHAVE_GLUI", + "-DHAVE_XMB", + "-D_LZMA_UINT32_IS_ULONG", + ); + PRODUCT_NAME = "RetroArch copy"; + PROVISIONING_PROFILE = ""; + VALID_ARCHS = "armv7 armv7s"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; 96AFAE5216C1D4EA009DE44C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -522,6 +804,7 @@ "-DHAVE_GLUI", "-DHAVE_XMB", "-D_LZMA_UINT32_IS_ULONG", + "-DHAVE_MFI", ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -588,6 +871,7 @@ "-DHAVE_GLUI", "-DHAVE_XMB", "-D_LZMA_UINT32_IS_ULONG", + "-DHAVE_MFI", ); "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", @@ -623,6 +907,7 @@ "-DHAVE_GLUI", "-DHAVE_XMB", "-D_LZMA_UINT32_IS_ULONG", + "-DHAVE_MFI", ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -634,6 +919,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 503700AA1ACA18E400A51A37 /* Build configuration list for PBXNativeTarget "RetroArch iOS6" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 503700AB1ACA18E400A51A37 /* Debug */, + 503700AC1ACA18E400A51A37 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 96AFAE1F16C1D4EA009DE44C /* Build configuration list for PBXProject "RetroArch_iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/apple/iOS/iOS/RetroArch-Info.plist b/apple/iOS/iOS/RetroArch-Info.plist index 894a0d8752..2d3ca64df5 100644 --- a/apple/iOS/iOS/RetroArch-Info.plist +++ b/apple/iOS/iOS/RetroArch-Info.plist @@ -33,11 +33,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.3 + 1.1.0 CFBundleSignature ???? CFBundleVersion - 1.0.3 + 1.1.0 LSRequiresIPhoneOS UIApplicationExitsOnSuspend diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index cb45f939fd..2283cc9d14 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -19,7 +19,9 @@ #include "../common/RetroArch_Apple.h" #include "../../input/drivers/apple_input.h" #include "../../settings.h" +#ifdef HAVE_MFI #include "../common/apple_gamecontroller.h" +#endif #include "menu.h" #include "../../menu/menu.h" @@ -307,7 +309,9 @@ void notify_content_loaded(void) ih->notify_content_loaded = notify_content_loaded; } +#ifdef HAVE_MFI apple_gamecontroller_init(); +#endif [self showPauseMenu:self]; diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m index 5dbd1d6fe2..d569b06c32 100644 --- a/griffin/griffin_objc.m +++ b/griffin/griffin_objc.m @@ -4,10 +4,6 @@ #define __IPHONE_OS_VERSION_MAX_ALLOWED 00000 #endif -#if __IPHONE_7_0 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 -#define HAVE_MFI -#endif - #include "../apple/common/CFExtensions.m" #include "../apple/common/utility.m" diff --git a/input/drivers_joypad/apple_joypad_ios.c b/input/drivers_joypad/apple_joypad_ios.c index 912d6a84eb..7eadf62452 100644 --- a/input/drivers_joypad/apple_joypad_ios.c +++ b/input/drivers_joypad/apple_joypad_ios.c @@ -18,7 +18,9 @@ #include "../input_autodetect.h" #include "../input_common.h" #include "../../general.h" +#ifdef HAVE_MFI #include "../../apple/common/apple_gamecontroller.h" +#endif #include "../connect/joypad_connection.h" joypad_connection_t *slots; @@ -94,7 +96,9 @@ static int16_t apple_joypad_axis(unsigned port, uint32_t joyaxis) static void apple_joypad_poll(void) { +#ifdef HAVE_MFI apple_gamecontroller_poll_all(); +#endif } static bool apple_joypad_rumble(unsigned pad,