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

(OSX) Uses CFTemporaryDirectory now too for extraction directory

Browse Source
This commit is contained in:
Twinaphex 2015-03-13 03:47:25 +01:00
parent 55e187748c
commit 49f9fbd00c
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/common/CFExtensions.h
View File

@ -63,8 +63,6 @@ typedef enum
void CFSearchPathForDirectoriesInDomains(unsigned flags, void CFSearchPathForDirectoriesInDomains(unsigned flags,
unsigned domain_mask, unsigned expand_tilde, char *buf, size_t sizeof_buf); unsigned domain_mask, unsigned expand_tilde, char *buf, size_t sizeof_buf);
#ifdef IOS
void CFTemporaryDirectory(char *buf, size_t sizeof_buf); void CFTemporaryDirectory(char *buf, size_t sizeof_buf);
#endif
#endif #endif

15
apple/common/CFExtensions.m
View File

@ -63,24 +63,11 @@ static NSSearchPathDomainMask NSConvertDomainFlagsCF(unsigned flags)
return 0; return 0;
} }
#ifdef IOS
NS_INLINE CF_RETURNS_RETAINED CFStringRef CFBridgingRetainStringRefCompat(id X)
{
#if __has_feature(objc_arc)
return (__bridge_retained CFStringRef)X;
#else
return (CFStringRef)X;
#endif
}
void CFTemporaryDirectory(char *buf, size_t sizeof_buf) void CFTemporaryDirectory(char *buf, size_t sizeof_buf)
{ {
CFStringRef path = (CFStringRef)(CFBridgingRetainStringRefCompat(NSTemporaryDirectory())); CFStringRef path = (CFStringRef)NSTemporaryDirectory();
CFStringGetCString(path, buf, sizeof_buf, kCFStringEncodingUTF8); CFStringGetCString(path, buf, sizeof_buf, kCFStringEncodingUTF8);
CFRelease(path);
} }
#endif
void CFSearchPathForDirectoriesInDomains(unsigned flags, void CFSearchPathForDirectoriesInDomains(unsigned flags,
unsigned domain_mask, unsigned expand_tilde, unsigned domain_mask, unsigned expand_tilde,

7
frontend/drivers/platform_apple.c
View File

@ -66,12 +66,13 @@ static void frontend_apple_get_environment_settings(int *argc, char *argv[],
fill_pathname_join(g_defaults.cheats_dir, home_dir_buf, "cht", sizeof(g_defaults.cheats_dir)); fill_pathname_join(g_defaults.cheats_dir, home_dir_buf, "cht", sizeof(g_defaults.cheats_dir));
strlcpy(g_defaults.sram_dir, g_defaults.system_dir, sizeof(g_defaults.sram_dir)); strlcpy(g_defaults.sram_dir, g_defaults.system_dir, sizeof(g_defaults.sram_dir));
strlcpy(g_defaults.savestate_dir, g_defaults.system_dir, sizeof(g_defaults.savestate_dir)); strlcpy(g_defaults.savestate_dir, g_defaults.system_dir, sizeof(g_defaults.savestate_dir));
#ifdef IOS
CFTemporaryDirectory(temp_dir, sizeof(temp_dir)); CFTemporaryDirectory(temp_dir, sizeof(temp_dir));
strlcpy(g_defaults.extraction_dir, temp_dir, sizeof(g_defaults.extraction_dir)); strlcpy(g_defaults.extraction_dir, temp_dir, sizeof(g_defaults.extraction_dir));
fill_pathname_join(g_defaults.shader_dir, home_dir_buf, "shaders_glsl", sizeof(g_defaults.shader_dir)); fill_pathname_join(g_defaults.shader_dir, home_dir_buf, "shaders_glsl", sizeof(g_defaults.shader_dir));
#elif defined(OSX)
#if defined(OSX)
fill_pathname_join(g_defaults.shader_dir, home_dir_buf, "shaders_cg", sizeof(g_defaults.shader_dir)); fill_pathname_join(g_defaults.shader_dir, home_dir_buf, "shaders_cg", sizeof(g_defaults.shader_dir));
fill_pathname_join(g_defaults.audio_filter_dir, home_dir_buf, "audio_filters", sizeof(g_defaults.audio_filter_dir)); fill_pathname_join(g_defaults.audio_filter_dir, home_dir_buf, "audio_filters", sizeof(g_defaults.audio_filter_dir));
fill_pathname_join(g_defaults.video_filter_dir, home_dir_buf, "video_filters", sizeof(g_defaults.video_filter_dir)); fill_pathname_join(g_defaults.video_filter_dir, home_dir_buf, "video_filters", sizeof(g_defaults.video_filter_dir));