Merge pull request #3569 from frangarcj/master

Allow "Load Content" when RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME = true on static
This commit is contained in:
Twinaphex 2016-09-12 08:24:53 +02:00 committed by GitHub
commit 488079d39f
1 changed files with 4 additions and 0 deletions

View File

@ -871,8 +871,10 @@ static void content_load_init_wrap(
*argc = 0;
argv[(*argc)++] = strdup("retroarch");
#ifndef HAVE_DYNAMIC
if (!args->no_content)
{
#endif
if (args->content_path)
{
RARCH_LOG("Using content: %s.\n", args->content_path);
@ -886,7 +888,9 @@ static void content_load_init_wrap(
argv[(*argc)++] = strdup("--menu");
}
#endif
#ifndef HAVE_DYNAMIC
}
#endif
if (args->sram_path)
{