Skip to content

Commit 72884cc

Browse files
authored
Update Makefile + Update Libco + Change paths from sd:/ to fs:/vol/external01 (#101)
* Update Makefile * Update Makefile * Change Paths Change paths from sd:/ to fs:/vol/external01 * Update Libco * Revert "Fix type to enable compilation (#92)" This reverts commit 8bfa3b8. * Revert "added ToadKing libco support that fixes emscripten build (#90)" This reverts commit 410d7bf. * Revert "use static_linking for emscripten platform (#89)" This reverts commit c50fb61. * Missed a sd: to fs:/vol/external01 change * Reapply "Fix type to enable compilation (#92)" This reverts commit f72bc29. * Reapply "use static_linking for emscripten platform (#89)" This reverts commit 25f0f5c. * Reapply "added ToadKing libco support that fixes emscripten build (#90)" This reverts commit ce1b4af. * found another sd:/ path that needed changing
1 parent 7215aa2 commit 72884cc

File tree

6 files changed

+320
-93
lines changed

6 files changed

+320
-93
lines changed

.bash_history

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cd /developer
2+
make -f Makefile.libretro platform=wiiu -j3 DEBUG_ALLOW_DIRTY_SUBMODULES=1
3+
make -f Makefile platform=wiiu -j3 DEBUG_ALLOW_DIRTY_SUBMODULES=1
4+
make clean
5+
make -f Makefile platform=wiiu -j3 DEBUG_ALLOW_DIRTY_SUBMODULES=1
6+
exit

Makefile

+4-5
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,15 @@ else ifneq (,$(filter $(platform), ngc wii wiiu))
246246
CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
247247
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
248248
PLATFORM_DEFINES += -DGEKKO -mcpu=750 -meabi -mhard-float -DHAVE_STRTOF_L -DHAVE_LOCALE
249-
PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int -D_GNU_SOURCE
250249
STATIC_LINKING = 1
251250
HAVE_COMPAT = 1
252251
ifneq (,$(findstring wiiu,$(platform)))
253-
CFLAGS += -DDEFAULT_CFG_NAME="\"sd:/retroarch/cores/system/atari800.cfg\""
254-
PLATFORM_DEFINES += -DWIIU -DHW_RVL
252+
CFLAGS += -DDEFAULT_CFG_NAME="\"fs:/vol/external01/retroarch/cores/system/atari800.cfg\""
253+
PLATFORM_DEFINES += -DWIIU -DHW_RVL -ffunction-sections -fdata-sections -D__wiiu__ -D__wut__ -D_GNU_SOURCE
255254
else ifneq (,$(findstring wii,$(platform)))
256-
PLATFORM_DEFINES += -DHW_RVL -mrvl
255+
PLATFORM_DEFINES += -DHW_RVL -mrvl -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int -D_GNU_SOURCE
257256
else ifneq (,$(findstring ngc,$(platform)))
258-
PLATFORM_DEFINES += -DHW_DOL -mrvl
257+
PLATFORM_DEFINES += -DHW_DOL -mrvl -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int -D_GNU_SOURCE
259258
endif
260259

261260
# Nintendo Switch (libnx)

atari800/src/atari.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ int Atari800_Initialise(int *argc, char *argv[])
451451
#endif
452452

453453
#if defined(WIIU) && defined(__LIBRETRO__)
454-
SYSROM_FindInDir("sd:/retroarch/cores/system/atari800", TRUE);
454+
SYSROM_FindInDir("fs:/vol/external01/retroarch/cores/system/atari800", TRUE);
455455
#endif
456456

457457
if (*argc > 0 && argv[0] != NULL) {

atari800/src/cfg.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ extern const char *retro_system_directory;
8383
#endif
8484

8585
#ifdef WIIU
86-
#define DEFAULT_CFG_NAME "sd:/retroarch/cores/system/atari800.cfg"
87-
#define SYSTEM_WIDE_CFG_FILE "sd:/retroarch/cores/system/atari800.cfg"
86+
#define DEFAULT_CFG_NAME "fs:/vol/external01/retroarch/cores/system/atari800.cfg"
87+
#define SYSTEM_WIDE_CFG_FILE "fs:/vol/external01/retroarch/cores/system/atari800.cfg"
8888
#endif
8989

9090
static char rtconfig_filename[FILENAME_MAX];

atari800/src/ui_basic.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -939,8 +939,8 @@ static void GetDirectory(const char *directory)
939939
FilenamesAdd(Util_strdup("[mc0:]"));
940940
#endif
941941
#ifdef WIIU
942-
// FIXME: limited to sd: add usb:
943-
FilenamesAdd(Util_strdup("[sd:]"));
942+
// FIXME: limited to fs:/vol/external01 add usb:
943+
FilenamesAdd(Util_strdup("[fs:/vol/external01]"));
944944
#endif
945945

946946
#ifdef DOS_DRIVES
@@ -1159,9 +1159,9 @@ static int FileSelector(char *path, int select_dir, char pDirectories[][FILENAME
11591159
}
11601160
#endif
11611161
#ifdef WIIU
1162-
// FIXME for now only sd: ,please add usb:
1163-
else if (strcmp(selected_filename, "[sd:]") == 0) {
1164-
strcpy(new_dir, "sd:/");
1162+
// FIXME for now only fs:/vol/external01 ,please add usb:
1163+
else if (strcmp(selected_filename, "[fs:/vol/external01]") == 0) {
1164+
strcpy(new_dir, "fs:/vol/external01/");
11651165
}
11661166
#endif
11671167
#ifdef DOS_DRIVES

0 commit comments

Comments
 (0)