shaders go in a subfolder now

This commit is contained in:
radius 2015-07-12 03:53:09 -04:00
parent 7f9bd9bd8a
commit 01ce2eaf31

View File

@ -457,7 +457,7 @@ static bool test_permissions(const char *path)
if(ret) if(ret)
rmdir(path); rmdir(path);
return ret; return ret;
} }
static void frontend_android_get_environment_settings(int *argc, static void frontend_android_get_environment_settings(int *argc,
@ -718,12 +718,12 @@ static void frontend_android_get_environment_settings(int *argc,
if(*sdcard_dir) if(*sdcard_dir)
{ {
if(test_permissions(sdcard_dir)) if(test_permissions(sdcard_dir))
perms = SDCARD_ROOT_WRITABLE; perms = SDCARD_ROOT_WRITABLE;
} }
else if(*ext_dir) else if(*ext_dir)
{ {
if(test_permissions(ext_dir)) if(test_permissions(ext_dir))
perms = SDCARD_EXT_DIR_WRITABLE; perms = SDCARD_EXT_DIR_WRITABLE;
} }
else else
perms = SDCARD_NOT_WRITABLE; perms = SDCARD_NOT_WRITABLE;
@ -738,7 +738,7 @@ static void frontend_android_get_environment_settings(int *argc,
fill_pathname_join(g_defaults.extraction_dir, app_dir, fill_pathname_join(g_defaults.extraction_dir, app_dir,
"tmp", sizeof(g_defaults.extraction_dir)); "tmp", sizeof(g_defaults.extraction_dir));
fill_pathname_join(g_defaults.shader_dir, app_dir, fill_pathname_join(g_defaults.shader_dir, app_dir,
"shaders_glsl", sizeof(g_defaults.shader_dir)); "shaders", sizeof(g_defaults.shader_dir));
fill_pathname_join(g_defaults.overlay_dir, app_dir, fill_pathname_join(g_defaults.overlay_dir, app_dir,
"overlays", sizeof(g_defaults.overlay_dir)); "overlays", sizeof(g_defaults.overlay_dir));
fill_pathname_join(g_defaults.core_dir, app_dir, fill_pathname_join(g_defaults.core_dir, app_dir,
@ -768,18 +768,18 @@ static void frontend_android_get_environment_settings(int *argc,
if(*downloads_dir && test_permissions(downloads_dir)) if(*downloads_dir && test_permissions(downloads_dir))
{ {
fill_pathname_join(g_defaults.core_assets_dir, fill_pathname_join(g_defaults.core_assets_dir,
downloads_dir, "", sizeof(g_defaults.core_assets_dir)); downloads_dir, "", sizeof(g_defaults.core_assets_dir));
} }
else else
{ {
fill_pathname_join(g_defaults.core_assets_dir, fill_pathname_join(g_defaults.core_assets_dir,
app_dir, "downloads", sizeof(g_defaults.core_assets_dir)); app_dir, "downloads", sizeof(g_defaults.core_assets_dir));
path_mkdir(g_defaults.core_assets_dir); path_mkdir(g_defaults.core_assets_dir);
} }
if(*screenshot_dir && test_permissions(screenshot_dir)) if(*screenshot_dir && test_permissions(screenshot_dir))
{ {
fill_pathname_join(g_defaults.screenshot_dir, fill_pathname_join(g_defaults.screenshot_dir,
screenshot_dir, "", sizeof(g_defaults.screenshot_dir)); screenshot_dir, "", sizeof(g_defaults.screenshot_dir));
} }
else else
{ {
@ -810,7 +810,7 @@ static void frontend_android_get_environment_settings(int *argc,
break; break;
case SDCARD_ROOT_WRITABLE: case SDCARD_ROOT_WRITABLE:
default: default:
break; break;
} }
} }
} }