Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(WiiU) Fix compatibility with upcoming Aroma build #102

Merged
merged 2 commits into from
Jun 28, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
(WiiU) Use libretro system dir instead of hardcoding paths
The SD card path has changed in newer builds (fs:/vol/external01 instead of sd:/). There's no reason to hardcode either path, so instead use the libretro API for this.

CONFDIR seems unused.
ashquarky committed Jun 20, 2024
commit 279524e864515861ff3f0b9160f76def27a3180c
2 changes: 0 additions & 2 deletions libretro/retromain.inc
Original file line number Diff line number Diff line change
@@ -40,8 +40,6 @@ FILE* FAKEtmpfile()
{
return fopen(tmpCfg, "w+");
}
#elif defined(WIIU)
#define CONFDIR "sd:/retroarch/cores/system"
#elif defined(GEKKO)
#define CONFDIR "sd:/HOMEBREW/ST"
#elif defined(VITA)
11 changes: 3 additions & 8 deletions src/paths.c
Original file line number Diff line number Diff line change
@@ -207,8 +207,8 @@ static void Paths_InitHomeDirs(void)
{
char *psHome;
#ifdef WIIU
strcpy(sUserHomeDir, "sd:/retroarch/cores/system");
strcpy(sHatariHomeDir, "sd:/retroarch/cores/system/hatari");
strcpy(sUserHomeDir, RETRO_DIR);
snprintf(sHatariHomeDir, sizeof(sHatariHomeDir), "%s%c%s", RETRO_DIR, PATHSEP, HATARI_HOME_DIR);
if (!File_DirExists(sHatariHomeDir))
{
if (mkdir(sHatariHomeDir, 0755) != 0)
@@ -309,12 +309,7 @@ void Paths_Init(const char* argv0)
char* psExecDir; /* Path string where the hatari executable can be found */

#ifdef __LIBRETRO__
#ifdef WIIU
strcpy(sWorkingDir, "sd:/retroarch/cores");
strcpy(sDataDir, "sd:/retroarch/cores/system");
Paths_InitHomeDirs();
return;
#elif defined(VITA)
#if defined(VITA)
strcpy(sWorkingDir, "ux0:/data/retroarch/system");
strcpy(sDataDir, "ux0:/data/retroarch/system");
Paths_InitHomeDirs();