Wii U: update for Aroma

Author: Hydr8gon

.github/workflows/autobuild.yml

@@ -115,18 +115,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v1
     - name: Compile
-      run: |
-        make wiiu -j$(nproc)
-        mv icon/icon-wiiu.png icon.png
-        mv icon/meta.xml meta.xml
+      run: make wiiu -j$(nproc)
     - name: Upload
       uses: actions/upload-artifact@v2
       with:
         name: noods-wiiu
-        path: |
-          icon.png
-          meta.xml
-          noods.rpx
+        path: noods.wuhb
 
   build-vita:
     runs-on: ubuntu-latest

.gitignore

@@ -16,6 +16,7 @@
 /noods.rpx
 /noods.velf
 /noods.vpk
+/noods.wuhb
 /noods.ini
 /param.sfo
 bios7.bin

Makefile.wiiu

@@ -2,6 +2,11 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
 endif
 
+APP_NAME := NooDS
+APP_SHORTNAME := NooDS
+APP_AUTHOR := Hydr8gon
+APP_ICON := ../icon/icon-vita.png
+
 include $(DEVKITPRO)/wut/share/wut_rules
 
 NAME := noods
@@ -39,11 +44,12 @@ build-shader:
 	cd src/console/shaders; ./latte-assembler compile shader_wiiu.gsh --vsh shader_wiiu.vsh --psh shader_wiiu.psh
 
 clean:
-	rm -rf $(BUILD) $(NAME).rpx $(NAME).elf
+	rm -rf $(BUILD) $(NAME).wuhb $(NAME).rpx $(NAME).elf
 
 else
 
-all: $(OUTPUT).rpx
+all: $(OUTPUT).wuhb
+$(OUTPUT).wuhb: $(OUTPUT).rpx
 $(OUTPUT).rpx: $(OUTPUT).elf
 $(OUTPUT).elf: $(OFILES)
 

icon/icon-wiiu.png

@@ -19,14 +19,16 @@
 
 #ifdef __WIIU__
 
+#include <coreinit/foreground.h>
 #include <coreinit/memdefaultheap.h>
 #include <gx2/display.h>
 #include <gx2/draw.h>
 #include <gx2/mem.h>
 #include <gx2/registers.h>
 #include <gx2r/draw.h>
+#include <proc_ui/procui.h>
+#include <sysapp/launch.h>
 #include <vpad/input.h>
-#include <whb/proc.h>
 #include <whb/sdcard.h>
 #include <whb/gfx.h>
 #include <SDL2/SDL.h>
@@ -282,7 +284,7 @@ void outputAudio(void *data, uint8_t *buffer, int length)
 int main()
 {
     // Initialize various things
-    WHBProcInit();
+    ProcUIInit(OSSavesDone_ReadyToRelease);
     WHBGfxInit();
     VPADInit();
     WHBMountSdCard();
@@ -382,8 +384,22 @@ int main()
 
     // Run the emulator until it exits
     ConsoleUI::mainLoop(nullptr, &gpLayout);
-    WHBProcShutdown();
-    return 0;
+    SYSLaunchMenu();
+
+    // Respond to system messages appropriately to allow exiting
+    while (true)
+    {
+        switch (ProcUIProcessMessages(true))
+        {
+            case PROCUI_STATUS_EXITING:
+                ProcUIShutdown();
+                return 0;
+
+            case PROCUI_STATUS_RELEASE_FOREGROUND:
+                ProcUIDrawDoneRelease();
+                break;
+        }
+    }
 }
 
 #endif // __WIIU__