(wiiu) fix salamander

missed a few things in the initial port

Author: ashquarky

Makefile.wiiu

@@ -43,12 +43,40 @@ OBJ += wiiu/system/stubs_rpl.o
 ifeq ($(SALAMANDER_BUILD),1)
    DEFINES += -DRARCH_CONSOLE -DIS_SALAMANDER -DHAVE_LIBMOCHA
 
+   DEFINES += -DHAVE_LIBMOCHA
    INCDIRS += -Ideps/libmocha/include
+   OBJ += deps/libmocha/source/disc_interface.o \
+      deps/libmocha/source/fsa.o \
+      deps/libmocha/source/utils.o \
+      deps/libmocha/source/devoptab/devoptab_fsa.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_chdir.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_chmod.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_close.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_dirclose.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_dirnext.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_diropen.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_dirreset.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_fchmod.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_fstat.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_fsync.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_link.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_mkdir.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_open.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_read.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_rename.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_rmdir.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_seek.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_stat.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_statvfs.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_truncate.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_unlink.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_utils.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_utimes.o \
+      deps/libmocha/source/devoptab/devoptab_fsa_write.o
 
    OBJ += frontend/frontend_salamander.o
    OBJ += frontend/frontend_driver.o
    OBJ += frontend/drivers/platform_wiiu.o
-   OBJ += deps/libmocha/source/utils.o
    OBJ += libretro-common/encodings/encoding_utf.o
    OBJ += libretro-common/compat/compat_strcasestr.o
    OBJ += libretro-common/compat/fopen_utf8.o

frontend/drivers/platform_wiiu.c

@@ -48,12 +48,15 @@
 #endif
 #endif
 
-#if defined(HAVE_LIBMOCHA) && defined(HAVE_LIBFAT)
-#include <fat.h>
+#ifdef HAVE_LIBMOCHA
 #include <mocha/disc_interface.h>
 #include <mocha/mocha.h>
 #endif
 
+#ifdef HAVE_LIBFAT
+#include <fat.h>
+#endif
+
 #include "system/memory.h"
 #include "system/exception_handler.h"
 
@@ -83,11 +86,13 @@
 
 #ifndef IS_SALAMANDER
 static enum frontend_fork wiiu_fork_mode     = FRONTEND_FORK_NONE;
+static bool               in_main            = false;
+
 static bool               have_libfat_usb    = false;
 static bool               have_libfat_sdcard = false;
-static bool               have_wfs_usb       = false;
 #endif
-static bool in_exec = false;
+static bool have_wfs_usb = false;
+static bool in_exec      = false;
 
 static bool exists(char* path)
 {
@@ -509,15 +514,15 @@ static uint32_t proc_release(void* param)
    return 0;
 }
 
-static bool in_main = false;
-
 static uint32_t proc_home_button_deny(void* param)
 {
    (void)param;
 
+#ifndef IS_SALAMANDER
    /* Don't toggle the menu in, like, the middle of a core switch */
    if (in_main)
       command_event(CMD_EVENT_MENU_TOGGLE, NULL);
+#endif
 
    return 0;
 }