From b50c3013ea74298e2fa629c2254eec1edf930ffb Mon Sep 17 00:00:00 2001
From: retro100 <retro100@dummy.local>
Date: Thu, 22 Apr 2021 14:52:39 +0200
Subject: [PATCH] fix1: Small changes for update to current devkitPro/libogc
 version.

---
 Makefile                              | 9 +++++++--
 src/platform/wii/menu.cpp             | 1 +
 src/platform/wii/missingfunctions.cpp | 1 +
 src/platform/wii/wiihardware.cpp      | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 904d0b6..b0aee03 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,11 @@ endif
 
 include $(DEVKITPPC)/wii_rules
 
+# override the bin2o definition for disable header creation
+define bin2o
+	bin2s -a 32 $< | $(AS) -o $(<F).o
+endef
+
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
 # BUILD is the directory where object files & intermediate files will be placed
@@ -37,7 +42,7 @@ LDFLAGS		=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
 # any extra libraries we wish to link with
 #---------------------------------------------------------------------------------
 LIBS	:=	-lSDL -lfat -lwiiuse -lbte -lasnd -logc -lwiikeyboard \
-			-lpng -lvorbisidec -lfreetype -lz
+			-lpng -lvorbisidec -logg -lfreetype -lbz2 -lz
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -91,7 +96,7 @@ export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
 export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
 					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(PORTLIBS)/include/freetype2
+					-I$(LIBOGC_INC) -I$(PORTLIBS_PATH)/wii/include/SDL -I$(PORTLIBS_PATH)/ppc/include/freetype2
 
 #---------------------------------------------------------------------------------
 # build a list of library paths
diff --git a/src/platform/wii/menu.cpp b/src/platform/wii/menu.cpp
index 7a21399..187ec47 100644
--- a/src/platform/wii/menu.cpp
+++ b/src/platform/wii/menu.cpp
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <wiiuse/wpad.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #include <unistd.h>
 
 #include "libwiigui/gui.h"
diff --git a/src/platform/wii/missingfunctions.cpp b/src/platform/wii/missingfunctions.cpp
index 90bcbce..fb316fc 100644
--- a/src/platform/wii/missingfunctions.cpp
+++ b/src/platform/wii/missingfunctions.cpp
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <libgen.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #include "dos_inc.h"
 
 static char tmp[MAXPATHLEN];
diff --git a/src/platform/wii/wiihardware.cpp b/src/platform/wii/wiihardware.cpp
index 665966e..71a57cd 100644
--- a/src/platform/wii/wiihardware.cpp
+++ b/src/platform/wii/wiihardware.cpp
@@ -149,7 +149,7 @@ static void * PressKeys (void *arg)
 static bool gecko = false;
 static mutex_t gecko_mutex = 0;
 
-static ssize_t __out_write(struct _reent *r, int fd, const char *ptr, size_t len)
+static ssize_t __out_write(struct _reent *r, void* fd, const char *ptr, size_t len)
 {
 	u32 level;