wii:

- add support in many places
- libromfs use in correct place

Author: Totto16

platforms/build-wii.sh

@@ -13,6 +13,7 @@ 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"
@@ -55,9 +56,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', '-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', '-isystem', '$WUT/include', '-I$PORTLIBS_PATH_PPC/include', '-I$PORTLIBS_PATH_OGC/include'"
 
-export LINK_FLAGS="'-L$LIBOGC/lib','-L$PORTLIBS_LIB_PPC','-L$PORTLIBS_LIB_OGC'"
+export LINK_FLAGS="'-L$LIBOGC_LIB','-L$WUT/lib','-L$PORTLIBS_LIB_PPC','-L$PORTLIBS_LIB_OGC'"
 
 export CROSS_FILE="./platforms/crossbuild-wii.ini"
 
@@ -107,7 +108,7 @@ cpp_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
 [properties]
 pkg_config_libdir = '$PKG_CONFIG_PATH'
 needs_exe_wrapper = true
-library_dirs= ['$LIBOGC_LIB', '$PORTLIBS_LIB_OGC','$PORTLIBS_LIB_PPC']
+library_dirs= ['$LIBOGC_LIB', '$WUT/lib', '$PORTLIBS_LIB_OGC','$PORTLIBS_LIB_PPC']
 
 USE_META_XML    = true
 

platforms/wii/meson.build

@@ -29,6 +29,7 @@ wii_dependencies_native = [
     'SDL2main',
     'wiikeyboard',
     'wiiuse',
+    'wut',
 ]
 
 foreach dep : wii_dependencies
@@ -54,34 +55,6 @@ foreach dep : wii_dependencies_native
     )
 endforeach
 
-## ROMFS handling, this is special in the case of the wii
-
-APP_ROMFS = meson.get_external_property('APP_ROMFS', '')
-
-if APP_ROMFS != ''
-    fs = import('fs')
-
-    if not fs.is_absolute(APP_ROMFS)
-        APP_ROMFS = meson.project_source_root() / APP_ROMFS
-    endif
-
-    if not fs.exists(APP_ROMFS)
-        error('APP_ROMFS should exist, but doesn\'t: \'' + APP_ROMFS + '\'')
-    endif
-
-    wii_deps = dependency(
-        'libromfs',
-        required: true,
-        allow_fallback: true,
-        native: false,
-        default_options: {'romfs_dir': APP_ROMFS},
-    )
-
-
-endif
-
-
-
 ## compilation
 
 wii_elf_file = build_target(

src/helper/console_helpers.cpp

@@ -11,6 +11,11 @@
 #elif defined(__3DS__)
 #include <3ds.h>
 #include <cstdlib>
+#elif defined(__WII__)
+#include <coreinit/debug.h>
+#include <wut.h>
+
+#include <romfs-wiiu.h>
 #endif
 
 #include <fmt/format.h>
@@ -20,6 +25,9 @@ void console::debug_write(const char* text, size_t size) {
     svcOutputDebugString(text, size);
 #elif defined(__SWITCH__)
     svcOutputDebugString(text, size);
+#elif defined(__WII__)
+    //TODO: maybe use OSReportVerbose
+    OSConsoleWrite(text, size);
 #else
 #error "not implemented"
 #endif
@@ -46,14 +54,23 @@ void console::debug_write(const char* text, size_t size) {
 #elif defined(__SWITCH__)
     UNUSED(url);
     return "";
+#elif defined(__WII__)
+    UNUSED(url);
+    return "";
 #else
 #error "not implemented"
 #endif
 }
 
 
+#if defined(__WII__)
+#define R_FAILED(x) ((x) != 0)
+#define Result int
+#endif
+
+
 void console::platform_init() {
-#if defined(__3DS__) || defined(__SWITCH__)
+#if defined(__3DS__) || defined(__SWITCH__) || defined(__WII__)
     Result ret = romfsInit();
     if (R_FAILED(ret)) {
         throw helper::InitializationError(fmt::format("romfsInit() failed: {:#2x}", static_cast<unsigned int>(ret)));
@@ -64,7 +81,7 @@ void console::platform_init() {
 }
 
 void console::platform_exit() {
-#if defined(__3DS__) || defined(__SWITCH__)
+#if defined(__3DS__) || defined(__SWITCH__) || defined(__WII__)
     Result ret = romfsExit();
     if (R_FAILED(ret)) {
         throw helper::InitializationError(fmt::format("romfsExit() failed: {:#2x}", static_cast<unsigned int>(ret)));
@@ -79,6 +96,9 @@ bool console::inMainLoop() {
     return aptMainLoop();
 #elif defined(__SWITCH__)
     return appletMainLoop();
+#elif defined(__WII__)
+    // the wii has no such logic
+    return true;
 #else
 #error "not implemented"
 #endif

src/helper/platform.cpp

@@ -43,6 +43,8 @@ namespace {
     return "Nintendo Switch";
 #elif defined(__3DS__)
     return "Nintendo 3DS";
+#elif defined(__WII__)
+    return "Wii";
 #elif defined(FLATPAK_BUILD)
     return "Linux (Flatpak)";
 #elif defined(__linux__)

src/input/console_buttons.hpp

@@ -131,6 +131,58 @@ enum JOYCON {
 static_assert(BIT(JOYCON_B) == KEY_B);
 static_assert(BIT(JOYCON_SELECT) == KEY_SELECT);
 
+#elif defined(__WII__)
+
+
+// some wii buttons, from (lib)wut, but since SDL doesn't handle inputs as flags, like (lib)wut), the have to be reversed and reversing 1 << x = log_2(x), this is done constexpr
+
+
+namespace {
+    // this is rounding down since >> 1 throws away the least significant bit, but if its a power of two it is spot on
+    constexpr unsigned int BIT_REVERSE(unsigned int x) {
+        return x == 1 ? 0 : 1 + BIT_REVERSE(x >> 1);
+    }
+}; // namespace
+
+
+#include <wut.h>
+#include <padscore/wpad.h>
+
+
+//using C enum (not enum class) on purpose
+enum JOYCON {
+
+    // see /opt/devkitpro/wut/include/padscore/wpad.h
+
+    JOYCON_LEFT = BIT_REVERSE(WPAD_BUTTON_LEFT),   ///! The left button of the D-pad.
+    JOYCON_RIGHT = BIT_REVERSE(WPAD_BUTTON_RIGHT), ///! The right button of the D-pad.
+    JOYCON_DOWN = BIT_REVERSE(WPAD_BUTTON_DOWN),   ///! The down button of the D-pad.
+    JOYCON_UP = BIT_REVERSE(WPAD_BUTTON_UP),       ///! The up button of the D-pad.
+
+    JOYCON_PLUS = BIT_REVERSE(WPAD_BUTTON_PLUS),   ///! The + button.
+    JOYCON_MINUS = BIT_REVERSE(WPAD_BUTTON_MINUS), ///! The - button.
+
+    JOYCON_1 = BIT_REVERSE(WPAD_BUTTON_1), ///! The 1 button.
+    JOYCON_2 = BIT_REVERSE(WPAD_BUTTON_2), ///! The 2 button.
+
+    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.
+
+    JOYCON_HOME = BIT_REVERSE(WPAD_BUTTON_HOME), ///! The HOME button.
+};
+
+/// Creates a bitmask from a bit number.
+#define BIT(n) (1U<<(n))
+
+// some static asserts to check if BIT_REVERSE works as expected
+static_assert(BIT(JOYCON_LEFT) == WPAD_BUTTON_LEFT);
+static_assert(BIT(JOYCON_HOME) == WPAD_BUTTON_HOME);
+
+#else
+#error "unsupported console"
 
 #endif
 

src/input/joystick_input.cpp

@@ -45,6 +45,11 @@ input::JoystickInput& input::JoystickInput::operator=(JoystickInput&& input) noe
         return std::make_unique<_3DSJoystickInput_Type1>(joystick, instance_id, name);
     }
 
+#elif defined(__WII_)
+    if (guid == WiiJoystickInput_Type1::guid) {
+        return std::make_unique<WiiJoystickInput_Type1>(joystick, instance_id, name);
+    }
+
 #endif
 #endif
 

src/input/joystick_input.hpp

@@ -193,8 +193,32 @@ namespace input {
     };
 
 
+#elif defined(__WII__)
+
+    struct WiiJoystickInput_Type1 : ConsoleJoystickInput {
+
+        //TODO
+        static constexpr sdl::GUID guid{};
+
+        WiiJoystickInput_Type1(SDL_Joystick* joystick, SDL_JoystickID instance_id, const std::string& name);
+
+        [[nodiscard]] helper::optional<NavigationEvent> get_navigation_event(const SDL_Event& event) const override;
+
+        [[nodiscard]] std::string describe_navigation_event(NavigationEvent event) const override;
+
+        [[nodiscard]] std::string key_to_string(console::SettingsType key) const override;
+
+        [[nodiscard]] JoystickSettings to_normal_settings(
+                const AbstractJoystickSettings<console::SettingsType>& settings
+        ) const override;
+
+        [[nodiscard]] AbstractJoystickSettings<console::SettingsType> default_settings_raw() const override;
+    };
+
+
 #endif
 
+
 #endif
 
 
@@ -305,7 +329,7 @@ namespace input {
     protected:
         [[nodiscard]] helper::optional<InputEvent> sdl_event_to_input_event(const SDL_Event& event) const override;
     };
-#if !defined(__SWITCH__) && !defined(__3DS__)
+#if !defined(__SWITCH__) && !defined(__3DS__) && !defined(__WII__)
 #error "unsupported console"
 #endif
 #endif

src/thirdparty/hash-library/sha256.cpp

@@ -27,6 +27,13 @@
 #define __BYTE_ORDER __BYTE_ORDER__
 #define __BIG_ENDIAN __ORDER_BIG_ENDIAN__
 #endif
+#elif defined(__WII__)
+#if !(defined(__BYTE_ORDER__) or defined(__ORDER_BIG_ENDIAN__))
+#error "__BYTE_ORDER__ or __ORDER_BIG_ENDIAN__ not defined"!
+#else
+#define __BYTE_ORDER __BYTE_ORDER__
+#define __BIG_ENDIAN __ORDER_BIG_ENDIAN__
+#endif
 #elif defined(__APPLE__)
 #include <machine/endian.h>
 #else

subprojects/libromfs.wrap

@@ -1,9 +1,11 @@
 
 
 [wrap-git]
+directory = libromfs-0.7
 url = https://github.com/yawut/libromfs-wiiu.git
 revision = master
 depth = 1
+
 patch_directory = libromfs
 
 [provide]

subprojects/packagefiles/libromfs/meson.build

@@ -12,16 +12,24 @@ deps = []
 
 
 if meson.is_cross_build()
-    if host_machine.system() == 'wiiu'
+    if host_machine.system() == 'wiiu' or host_machine.system() == 'wii'
 
         object_target = 'elf32-powerpc'
         binary_arch = 'powerpc:common'
-        ## deps +='wut' 
 
-    elif host_machine.system() == 'wii'
 
-        object_target = 'elf32-powerpc'
-        binary_arch = 'powerpc:common'
+        library_dirs = meson.get_external_property('library_dirs', [''])
+        if library_dirs.length() == 0
+            error('property \'library_dirs\' has to be set!')
+        endif
+
+        c = meson.get_compiler('c')
+
+        deps += c.find_library(
+            'wut',
+            required: true,
+            dirs: library_dirs,
+        )
 
     else
         error('not supported platform: ' + host_machine.system())
@@ -81,6 +89,7 @@ inc_dirs = include_directories('include')
 libromfs_lib = library(
     'libromfs',
     files('source/romfs.c'),
+    c_args: ['-D_POSIX_C_SOURCE=200809'],
     include_directories: inc_dirs,
     dependencies: deps,
     install: true,