From 4ef9258b63b781e0b624672ce5b083381a2a417d Mon Sep 17 00:00:00 2001
From: Ash Logan <ash@heyquark.com>
Date: Wed, 29 May 2019 18:23:21 +1000
Subject: [PATCH] wiiu: Add libfat/iosuhax to Griffin, always use builtins

---
 Makefile.wiiu     | 18 ++++--------------
 griffin/griffin.c | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Makefile.wiiu b/Makefile.wiiu
index f86ada643b..e9b4cc85ca 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -100,8 +100,8 @@ endif
       OBJ += griffin/griffin.o
 
       INCDIRS += -Ilibretro-common/include/compat/zlib
-      # for stb
-      INCDIRS += -Ideps
+      # for stb, libfat, iosuhax
+      INCDIRS += -Ideps -Ideps/libfat/include -Ideps/libiosuhax
       # pad_functions uses wiiu/input.h
       INCDIRS += -Iinput/include
 
@@ -112,6 +112,7 @@ endif
       #DEFINES += -DHAVE_FREETYPE
       DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
       DEFINES += -DHAVE_HID
+      DEFINES += -DWANT_LIBFAT -DHAVE_LIBFAT -DWANT_IOSUHAX -DHAVE_IOSUHAX
 
    # $(GRIFFIN_BUILD),0
    else
@@ -224,18 +225,7 @@ endif
 
 LIBS := $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm
 
-# Use portlibs libfat/iosuhax if not using ones in deps/
-ifneq ($(WANT_LIBFAT), 1)
-   INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
-   LIBDIRS += -L$(DEVKITPRO)/portlibs/ppc/lib
-   LIBS += -lfat
-endif
-ifneq ($(WANT_IOSUHAX), 1)
-   INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
-   LIBDIRS += -L$(DEVKITPRO)/portlibs/ppc/lib
-   LIBS += -liosuhax
-endif
-# Same deal for zlib
+# Use portlibs zlib if deps/ isn't being used
 ifeq ($(HAVE_ZLIB),1)
 ifeq ($(HAVE_BUILTINZLIB),0)
    INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 8b5d1eec02..58e534ef58 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1470,6 +1470,25 @@ DEPENDENCIES
 #include "../deps/7zip/7zBuf.c"
 #endif
 
+#ifdef WANT_LIBFAT
+#include "../deps/libfat/cache.c"
+#include "../deps/libfat/directory.c"
+#include "../deps/libfat/disc.c"
+#include "../deps/libfat/fatdir.c"
+#include "../deps/libfat/fatfile.c"
+#include "../deps/libfat/file_allocation_table.c"
+#include "../deps/libfat/filetime.c"
+#include "../deps/libfat/libfat.c"
+#include "../deps/libfat/lock.c"
+#include "../deps/libfat/partition.c"
+#endif
+
+#ifdef WANT_IOSUHAX
+#include "../deps/libiosuhax/iosuhax.c"
+#include "../deps/libiosuhax/iosuhax_devoptab.c"
+#include "../deps/libiosuhax/iosuhax_disc_interface.c"
+#endif
+
 /*============================================================
 XML
 ============================================================ */