ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4117 from terry1994/master 

Fix building on iOS 9 and below.
This commit is contained in:
Twinaphex 2016-12-01 14:26:21 +01:00 committed by GitHub
parent 5e2ced90f5 86c7afdd7c
commit 8f3039316a
3 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretro-common/features/features_cpu.c
View File

@ -108,7 +108,7 @@ static int ra_clock_gettime(int clk_ik, struct timespec *t)
} }
#endif #endif
#if defined(__MACH__) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000 #if defined(__MACH__) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000
#else #else
#define ra_clock_gettime clock_gettime #define ra_clock_gettime clock_gettime
#endif #endif

36
pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
View File

@ -453,7 +453,7 @@
}; };
}; };
}; };
buildConfigurationList = 96AFAE1F16C1D4EA009DE44C /* Build configuration list for PBXProject "RetroArch_iOS" */; buildConfigurationList = 96AFAE1F16C1D4EA009DE44C /* Build configuration list for PBXProject "RetroArch_iOS10" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
@ -636,7 +636,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -714,7 +714,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -763,7 +763,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -841,7 +841,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -915,7 +915,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -961,7 +961,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1023,7 +1023,7 @@
"../../libretro-common/include", "../../libretro-common/include",
); );
INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0; IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_NO_PIE = YES; LD_NO_PIE = YES;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
@ -1034,7 +1034,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1099,7 +1099,7 @@
"../../libretro-common/include", "../../libretro-common/include",
); );
INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0; IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_NO_PIE = YES; LD_NO_PIE = YES;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = ( OTHER_CFLAGS = (
@ -1111,7 +1111,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1160,7 +1160,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1242,7 +1242,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1310,7 +1310,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1379,7 +1379,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1456,7 +1456,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1505,7 +1505,7 @@
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
"-DHAVE_UPDATE_ASSETS", "-DHAVE_UPDATE_ASSETS",
"-DHAVE_LANGEXTRA", "-DHAVE_LANGEXTRA",
"-DHAVE_CHEEVOS", "-DHAVE_CHEEVOS",
"-DHAVE_IMAGEVIEWER", "-DHAVE_IMAGEVIEWER",
@ -1583,7 +1583,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
96AFAE1F16C1D4EA009DE44C /* Build configuration list for PBXProject "RetroArch_iOS" */ = { 96AFAE1F16C1D4EA009DE44C /* Build configuration list for PBXProject "RetroArch_iOS10" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
96AFAE5216C1D4EA009DE44C /* Debug */, 96AFAE5216C1D4EA009DE44C /* Debug */,

30
pkg/apple/RetroArch_iOS10.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS10.xcscmblueprint Normal file
View File

@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C7C12374C7051F8843B3EFA1ACCAF2907102CCF7",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"76200F0D6584D865E96F58DE862E738E88B23A3C" : 9223372036854775807,
"C7C12374C7051F8843B3EFA1ACCAF2907102CCF7" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "8BA6E269-73BB-4AAE-8F4A-967CCF8ACA14",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"76200F0D6584D865E96F58DE862E738E88B23A3C" : "",
"C7C12374C7051F8843B3EFA1ACCAF2907102CCF7" : "retroarch\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "RetroArch_iOS10",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "pkg\/apple\/RetroArch_iOS10.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/libretro\/libretro-super.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "76200F0D6584D865E96F58DE862E738E88B23A3C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/libretro\/RetroArch.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C7C12374C7051F8843B3EFA1ACCAF2907102CCF7"
}
]
}