Merge pull request #6442 from yoshisuga/small_fixes

[iOS]: Some small fixes
This commit is contained in:
Twinaphex 2018-03-23 10:02:39 +01:00 committed by GitHub
commit e179a39491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions

View File

@ -223,7 +223,7 @@
TargetAttributes = { TargetAttributes = {
9204BE091D319EF300BD49DB = { 9204BE091D319EF300BD49DB = {
DevelopmentTeam = UK699V5ZS8; DevelopmentTeam = UK699V5ZS8;
DevelopmentTeamName = "Yoshinobu Sugawara"; DevelopmentTeamName = "RetroArch";
}; };
}; };
}; };
@ -373,6 +373,7 @@
"-DHAVE_MFI", "-DHAVE_MFI",
"-DHAVE_BTSTACK", "-DHAVE_BTSTACK",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_KEYMAPPER",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11; PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
@ -459,6 +460,7 @@
"-DHAVE_MFI", "-DHAVE_MFI",
"-DHAVE_BTSTACK", "-DHAVE_BTSTACK",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_KEYMAPPER",
); );
"OTHER_CFLAGS[arch=*]" = ( "OTHER_CFLAGS[arch=*]" = (
"-DNS_BLOCK_ASSERTIONS=1", "-DNS_BLOCK_ASSERTIONS=1",
@ -511,6 +513,7 @@
"-DHAVE_MFI", "-DHAVE_MFI",
"-DHAVE_BTSTACK", "-DHAVE_BTSTACK",
"-DHAVE_AVFOUNDATION", "-DHAVE_AVFOUNDATION",
"-DHAVE_KEYMAPPER",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11; PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";

View File

@ -337,6 +337,14 @@ enum
return (RetroArch_iOS*)[[UIApplication sharedApplication] delegate]; return (RetroArch_iOS*)[[UIApplication sharedApplication] delegate];
} }
-(NSString*)documentsDirectory {
if ( _documentsDirectory == nil ) {
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
_documentsDirectory = paths.firstObject;
}
return _documentsDirectory;
}
- (void)applicationDidFinishLaunching:(UIApplication *)application - (void)applicationDidFinishLaunching:(UIApplication *)application
{ {
char arguments[] = "retroarch"; char arguments[] = "retroarch";
@ -377,6 +385,7 @@ enum
extern bool apple_gamecontroller_joypad_init(void *data); extern bool apple_gamecontroller_joypad_init(void *data);
apple_gamecontroller_joypad_init(NULL); apple_gamecontroller_joypad_init(NULL);
#endif #endif
} }
- (void)applicationDidEnterBackground:(UIApplication *)application - (void)applicationDidEnterBackground:(UIApplication *)application