wii

- don't use wut, but ogc, these two libraries conflict with each other! (wut is for wiiu only)
- fix libromfs, also support wii

Author: Totto16

platforms/build-wii.sh

@@ -13,7 +13,6 @@ export OGC_MACHINE="rvl"
 
 export PORTLIBS_PATH="$DEVKITPRO/portlibs"
 export LIBOGC="$DEVKITPRO/libogc"
-export WUT="$DEVKITPRO/wut"
 
 export PORTLIBS_PATH_OGC="$PORTLIBS_PATH/$OGC_CONSOLE"
 export PORTLIBS_PATH_PPC="$PORTLIBS_PATH/ppc"
@@ -56,9 +55,9 @@ export ENDIANESS="big"
 
 export COMMON_FLAGS="'-m${OGC_MACHINE}','-mcpu=750','-meabi','-mhard-float','-ffunction-sections','-fdata-sections'"
 
-export COMPILE_FLAGS="'-D__WII__','-D__CONSOLE__','-D__NINTENDO_CONSOLE__','-D_OGC_','-DGEKKO','-isystem', '$LIBOGC/include', '-isystem', '$WUT/include', '-I$PORTLIBS_PATH_PPC/include', '-I$PORTLIBS_PATH_OGC/include'"
+export COMPILE_FLAGS="'-D__WII__','-D__CONSOLE__','-D__NINTENDO_CONSOLE__','-D_OGC_','-DGEKKO','-isystem', '$LIBOGC/include', '-I$PORTLIBS_PATH_PPC/include', '-I$PORTLIBS_PATH_OGC/include'"
 
-export LINK_FLAGS="'-L$LIBOGC_LIB','-L$WUT/lib','-L$PORTLIBS_LIB_PPC','-L$PORTLIBS_LIB_OGC'"
+export LINK_FLAGS="'-L$LIBOGC_LIB','-L$PORTLIBS_LIB_PPC','-L$PORTLIBS_LIB_OGC'"
 
 export CROSS_FILE="./platforms/crossbuild-wii.ini"
 
@@ -108,7 +107,7 @@ cpp_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
 [properties]
 pkg_config_libdir = '$PKG_CONFIG_PATH'
 needs_exe_wrapper = true
-library_dirs= ['$LIBOGC_LIB', '$WUT/lib', '$PORTLIBS_LIB_OGC','$PORTLIBS_LIB_PPC']
+library_dirs= ['$LIBOGC_LIB', '$PORTLIBS_LIB_OGC','$PORTLIBS_LIB_PPC']
 
 USE_META_XML    = true
 

platforms/wii/meson.build

@@ -29,7 +29,6 @@ wii_dependencies_native = [
     'SDL2main',
     'wiikeyboard',
     'wiiuse',
-    'wut',
 ]
 
 foreach dep : wii_dependencies

src/helper/console_helpers.cpp

@@ -12,8 +12,7 @@
 #include <3ds.h>
 #include <cstdlib>
 #elif defined(__WII__)
-#include <coreinit/debug.h>
-#include <wut.h>
+#include <debug.h>
 
 #include <romfs-wiiu.h>
 #endif
@@ -26,8 +25,8 @@ void console::debug_write(const char* text, size_t size) {
 #elif defined(__SWITCH__)
     svcOutputDebugString(text, size);
 #elif defined(__WII__)
-    //TODO: maybe use OSReportVerbose
-    OSConsoleWrite(text, size);
+    UNUSED(text);
+    UNUSED(size);
 #else
 #error "not implemented"
 #endif

src/input/console_buttons.hpp

@@ -145,8 +145,7 @@ namespace {
 }; // namespace
 
 
-#include <wut.h>
-#include <padscore/wpad.h>
+#include <wiiuse/wpad.h>
 
 
 //using C enum (not enum class) on purpose
@@ -168,14 +167,14 @@ enum JOYCON {
     JOYCON_A = BIT_REVERSE(WPAD_BUTTON_A), ///! The A button.
     JOYCON_B = BIT_REVERSE(WPAD_BUTTON_B), ///! The B button.
 
-    JOYCON_C = BIT_REVERSE(WPAD_BUTTON_C), ///! The C button on the Nunchuk extension.
-    JOYCON_Z = BIT_REVERSE(WPAD_BUTTON_Z), ///! The Z button on the Nunchuk extension.
+    NUNCHUK_C = BIT_REVERSE(WPAD_NUNCHUK_BUTTON_C), ///! The C button on the Nunchuk extension.
+    NUNCHUK_Z = BIT_REVERSE(WPAD_NUNCHUK_BUTTON_Z), ///! The Z button on the Nunchuk extension.
 
     JOYCON_HOME = BIT_REVERSE(WPAD_BUTTON_HOME), ///! The HOME button.
 };
 
 /// Creates a bitmask from a bit number.
-#define BIT(n) (1U<<(n))
+#define BIT(n) (1U << (n))
 
 // some static asserts to check if BIT_REVERSE works as expected
 static_assert(BIT(JOYCON_LEFT) == WPAD_BUTTON_LEFT);

subprojects/libromfs.wrap

@@ -5,8 +5,8 @@ directory = libromfs-0.7
 url = https://github.com/yawut/libromfs-wiiu.git
 revision = master
 depth = 1
-
 patch_directory = libromfs
+diff_files = libromfs-0.7_wii.diff
 
 [provide]
 libromfs = libromfs_dep

subprojects/packagefiles/libromfs-0.7_wii.diff

@@ -0,0 +1,89 @@
+diff --git a/source/romfs.c b/source/romfs.c
+index 02d6bd5..a3c2c2a 100644
+--- a/source/romfs.c
++++ b/source/romfs.c
+@@ -15,7 +15,18 @@
+ #include <sys/param.h>
+ #include <stdint.h>
+ #include <unistd.h>
++
++#if defined(__WII__)
++#include <gccore.h>
++
++#define OSBlockMove(dest, src, size, flush) memmove((dest), (src), (size))
++
++#elif defined(__WIIU__)
+ #include <coreinit/memory.h>
++#else
++#error "Unsupported platform"
++#endif
++
+ 
+ 
+ /* include the implementation files (needed for static functions) */
+@@ -34,41 +45,41 @@ static int32_t romfs_initialised = 0;
+ /* romfsInit: intialize romfs */
+ int32_t romfsInit(void)
+ {
+-	/* already initialized */
+-	if (romfs_initialised)
+-		return 0;
++    /* already initialized */
++    if (romfs_initialised)
++        return 0;
+ 
+-	/* create romfs file entries */
+-	tar_create_entries(_binary_romfs_tar_start, _binary_romfs_tar_end);
++    /* create romfs file entries */
++    tar_create_entries(_binary_romfs_tar_start, _binary_romfs_tar_end);
+ 
+-	/* add the romfs devoptab to devices list */
+-	if (AddDevice(&romfs_devoptab) == -1)
+-	{
+-		node_destroytree(NULL, 0);
+-		return -1;
+-	}
++    /* add the romfs devoptab to devices list */
++    if (AddDevice(&romfs_devoptab) == -1)
++    {
++        node_destroytree(NULL, 0);
++        return -1;
++    }
+ 
+-	/* set the intialized flag */
+-	romfs_initialised = 1;
++    /* set the intialized flag */
++    romfs_initialised = 1;
+ 
+-	return 0;
++    return 0;
+ }
+ 
+ /* romfsExit: exit romfs */
+ int32_t romfsExit(void)
+ {
+-	/* never initialized */
+-	if (!romfs_initialised)
+-		return -1;
++    /* never initialized */
++    if (!romfs_initialised)
++        return -1;
+ 
+-	/* remove the romfs devoptab from devices list */
+-	RemoveDevice("romfs:");
++    /* remove the romfs devoptab from devices list */
++    RemoveDevice("romfs:");
+ 
+-	/* deallocate the file tree */
+-	node_destroytree(NULL, 0);
++    /* deallocate the file tree */
++    node_destroytree(NULL, 0);
+ 
+-	/* clear the initialized flag */
+-	romfs_initialised = 0;
++    /* clear the initialized flag */
++    romfs_initialised = 0;
+ 
+-	return 0;
++    return 0;
+ }

subprojects/packagefiles/libromfs/meson.build

@@ -25,11 +25,20 @@ if meson.is_cross_build()
 
         c = meson.get_compiler('c')
 
-        deps += c.find_library(
-            'wut',
-            required: true,
-            dirs: library_dirs,
-        )
+        if host_machine.system() == 'wiiu'
+            deps += c.find_library(
+                'wut',
+                required: true,
+                dirs: library_dirs,
+            )
+        elif host_machine.system() == 'wii'
+
+            deps += c.find_library(
+                'ogc',
+                required: true,
+                dirs: library_dirs,
+            )
+        endif
 
     else
         error('not supported platform: ' + host_machine.system())
@@ -70,13 +79,26 @@ romfs_tar = custom_target(
     output: [romfs_tar_name],
 )
 
+binary_start_name = (
+    '_binary' + (
+        romfs_tar.full_path().replace(meson.global_build_root(), '').replace(
+            '/',
+            '_',
+        ).replace('.', '_').replace('-', '_')
+    )
+)
+binary_final_name = '_binary_romfs_tar'
+
 romfs_object = custom_target(
     romfs_obj_name,
     command: [
         objcopy,
         '--input-target', 'binary',
         '--output-target', object_target,
         '--binary-architecture', binary_arch,
+        '--redefine-sym', binary_start_name + '_start=' + binary_final_name + '_start',
+        '--redefine-sym', binary_start_name + '_end=' + binary_final_name + '_end',
+        '--redefine-sym', binary_start_name + '_size=' + binary_final_name + '_size',
         '@INPUT@',
         '@OUTPUT@',
     ],
@@ -87,7 +109,7 @@ romfs_object = custom_target(
 inc_dirs = include_directories('include')
 
 libromfs_lib = library(
-    'libromfs',
+    'romfs',
     files('source/romfs.c'),
     c_args: ['-D_POSIX_C_SOURCE=200809'],
     include_directories: inc_dirs,