diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 2e3a7abb02..23c7bea44d 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -447,10 +447,12 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], #endif #endif -#if TARGET_OS_IOS +#if TARGET_OS_IPHONE char assets_zip_path[PATH_MAX_LENGTH]; +#if TARGET_OS_IOS if (major > 8) strlcpy(g_defaults.path.buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/", sizeof(g_defaults.path.buildbot_server_url)); +#endif fill_pathname_join(assets_zip_path, bundle_path_buf, "assets.zip", sizeof(assets_zip_path)); diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj index 70b8aa82f9..39f0effd6a 100644 --- a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj @@ -26,6 +26,8 @@ 9204BE201D319EF300BD49DB /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE3116C1D4EA009DE44C /* OpenGLES.framework */; }; 9204BE231D319EF300BD49DB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 967894611788EBD800D6CA69 /* InfoPlist.strings */; }; 9204BE261D319EF300BD49DB /* iOS/modules in Resources */ = {isa = PBXBuildFile; fileRef = 83EB675F19EEAF050096F441 /* iOS/modules */; }; + 9222F1FF2314BA7C0097C0FD /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 9222F1FE2314BA7C0097C0FD /* assets.zip */; }; + 9222F2002314BA7C0097C0FD /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 9222F1FE2314BA7C0097C0FD /* assets.zip */; }; 926C77E321FD1E6700103EDE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 926C77E221FD1E6700103EDE /* Assets.xcassets */; }; 926C77EA21FD20C100103EDE /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; 926C77EB21FD20C400103EDE /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; @@ -82,6 +84,7 @@ 69D31DE31A547EC800EF4C92 /* iOS/Resources/Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = iOS/Resources/Media.xcassets; sourceTree = SOURCE_ROOT; }; 83EB675F19EEAF050096F441 /* iOS/modules */ = {isa = PBXFileReference; lastKnownFileType = folder; path = iOS/modules; sourceTree = SOURCE_ROOT; }; 9204BE2B1D319EF300BD49DB /* RetroArchiOS11.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArchiOS11.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 9222F1FE2314BA7C0097C0FD /* assets.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = assets.zip; sourceTree = ""; }; 926C77D721FD1E6500103EDE /* RetroArchTV.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArchTV.app; sourceTree = BUILT_PRODUCTS_DIR; }; 926C77E221FD1E6700103EDE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 926C77E421FD1E6700103EDE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -274,6 +277,7 @@ 96AFAE1A16C1D4EA009DE44C = { isa = PBXGroup; children = ( + 9222F1FE2314BA7C0097C0FD /* assets.zip */, 96AFAE9C16C1D976009DE44C /* core */, 83D632D719ECFCC4009E3161 /* iOS */, 926C77D821FD1E6500103EDE /* tvOS */, @@ -397,12 +401,10 @@ ORGANIZATIONNAME = RetroArch; TargetAttributes = { 9204BE091D319EF300BD49DB = { - DevelopmentTeam = R72X3BF4KE; DevelopmentTeamName = RetroArch; }; 926C77D621FD1E6500103EDE = { CreatedOnToolsVersion = 10.1; - DevelopmentTeam = R72X3BF4KE; ProvisioningStyle = Automatic; }; }; @@ -436,6 +438,7 @@ 92CC05BC21FE3C1700FF79F0 /* GCDWebUploader.bundle in Resources */, 929784502200EEE400989A60 /* iOS/Resources/Media.xcassets in Resources */, 9204BE261D319EF300BD49DB /* iOS/modules in Resources */, + 9222F1FF2314BA7C0097C0FD /* assets.zip in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -445,6 +448,7 @@ files = ( 927BD1A42203DA3A00ECF6C9 /* iOS/modules in Resources */, 92CC05BD21FE3C1700FF79F0 /* GCDWebUploader.bundle in Resources */, + 9222F2002314BA7C0097C0FD /* assets.zip in Resources */, 926C77E321FD1E6700103EDE /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -557,14 +561,14 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; - DEVELOPMENT_TEAM = R72X3BF4KE; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = ( ../../, - ../../libretro-common/include, - ../../libretro-common/include/compat/zlib, + "../../libretro-common/include", + "../../libretro-common/include/compat/zlib", ../../deps/stb, ../../deps/rcheevos/include, ../../deps, @@ -582,7 +586,7 @@ "-DHAVE_NETWORKING", "-DHAVE_NETPLAYDISCOVERY", "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", + "-DHAVE_TRANSLATE", "-DHAVE_GRIFFIN", "-DHAVE_STB_VORBIS", "-DHAVE_MINIUPNPC", @@ -647,14 +651,14 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; - DEVELOPMENT_TEAM = R72X3BF4KE; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = ( ../../, - ../../libretro-common/include, - ../../libretro-common/include/compat/zlib, + "../../libretro-common/include", + "../../libretro-common/include/compat/zlib", ../../deps/stb, ../../deps/rcheevos/include, ../../deps, @@ -673,7 +677,7 @@ "-DHAVE_NETWORKING", "-DHAVE_NETPLAYDISCOVERY", "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", + "-DHAVE_TRANSLATE", "-DHAVE_GRIFFIN", "-DHAVE_STB_VORBIS", "-DHAVE_MINIUPNPC", @@ -773,8 +777,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; HEADER_SEARCH_PATHS = ( ../../, - ../../libretro-common/include, - ../../libretro-common/include/compat/zlib, + "../../libretro-common/include", + "../../libretro-common/include/compat/zlib", ../../deps/stb, ../../deps/rcheevos/include, ../../deps, @@ -792,7 +796,7 @@ "-DHAVE_NETWORKING", "-DHAVE_NETPLAYDISCOVERY", "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", + "-DHAVE_TRANSLATE", "-DHAVE_GRIFFIN", "-DHAVE_STB_VORBIS", "-DHAVE_MINIUPNPC", @@ -890,8 +894,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; HEADER_SEARCH_PATHS = ( ../../, - ../../libretro-common/include, - ../../libretro-common/include/compat/zlib, + "../../libretro-common/include", + "../../libretro-common/include/compat/zlib", ../../deps/stb, ../../deps/rcheevos/include, ../../deps, @@ -910,7 +914,7 @@ "-DHAVE_NETWORKING", "-DHAVE_NETPLAYDISCOVERY", "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", + "-DHAVE_TRANSLATE", "-DHAVE_GRIFFIN", "-DHAVE_STB_VORBIS", "-DHAVE_MINIUPNPC", @@ -1000,7 +1004,7 @@ "-DHAVE_NETWORKING", "-DHAVE_NETPLAYDISCOVERY", "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", + "-DHAVE_TRANSLATE", "-DHAVE_GRIFFIN", "-DHAVE_STB_VORBIS", "-DHAVE_MINIUPNPC", @@ -1074,7 +1078,7 @@ "-DHAVE_NETWORKING", "-DHAVE_NETPLAYDISCOVERY", "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", + "-DHAVE_TRANSLATE", "-DHAVE_GRIFFIN", "-DHAVE_STB_VORBIS", "-DHAVE_MINIUPNPC", diff --git a/pkg/apple/iOS/Info.plist b/pkg/apple/iOS/Info.plist index fe2a2cf3b2..563c6a3683 100644 --- a/pkg/apple/iOS/Info.plist +++ b/pkg/apple/iOS/Info.plist @@ -33,11 +33,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.7.7 + 1.7.8 CFBundleSignature ???? CFBundleVersion - 1.7.7 + 1.7.8 LSRequiresIPhoneOS LSSupportsOpeningDocumentsInPlace