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

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
parent 394d2a1e6b b5111d4654
commit 488079d39f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/task_content.c
View File

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