From f5669aa18ccd6d94939540faecb483c377995dbc Mon Sep 17 00:00:00 2001 From: Archie Halliwell Date: Mon, 12 Dec 2022 11:57:22 +1100 Subject: [PATCH 1/4] fix issue #19 --- channel/channelapp/stub/cache.h | 1 + 1 file changed, 1 insertion(+) diff --git a/channel/channelapp/stub/cache.h b/channel/channelapp/stub/cache.h index e75ac18..050c82a 100644 --- a/channel/channelapp/stub/cache.h +++ b/channel/channelapp/stub/cache.h @@ -39,6 +39,7 @@ distribution. */ #include +#include #define LC_BASEPREFIX 0xe000 #define LC_BASE (LC_BASEPREFIX<<16) From 756d4830c32a7937eedc5a7d7ebbff2f19036931 Mon Sep 17 00:00:00 2001 From: Archie Halliwell Date: Mon, 12 Dec 2022 11:57:54 +1100 Subject: [PATCH 2/4] fix freetype dependencies --- channel/channelapp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channel/channelapp/Makefile b/channel/channelapp/Makefile index 31c6a67..c569723 100644 --- a/channel/channelapp/Makefile +++ b/channel/channelapp/Makefile @@ -33,7 +33,7 @@ DIR_LIBS = \ $(DEVKITPRO)/libogc/lib/wii \ $(DEVKITPRO)/portlibs/ppc/lib -LIBS = mxml freetype png z db fat wiiuse bte ogc m +LIBS = mxml freetype bz2 png z db fat wiiuse bte ogc m MACHDEP = -g -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS = $(MACHDEP) -Os -Wall -DBASE_ADDR=$(BASE_ADDR) $(DIR_INCLUDES:%=-I%) From 09c4ca86154548943655151f8182642a6f5ec38c Mon Sep 17 00:00:00 2001 From: Archie Halliwell Date: Mon, 12 Dec 2022 11:58:13 +1100 Subject: [PATCH 3/4] fix TypeError --- pywii/Alameda/Alameda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywii/Alameda/Alameda.py b/pywii/Alameda/Alameda.py index 36bf7bc..68834f8 100644 --- a/pywii/Alameda/Alameda.py +++ b/pywii/Alameda/Alameda.py @@ -1046,7 +1046,7 @@ def _PackObject(self, object): atom.Flags2 = object.Flags2 atom.Material = object.Material atom.unk = object.Unk - atom.MaterialCoords = sum(object.MaterialCoords,[]) + atom.MaterialCoords = sum(object.MaterialCoords,()) data = atom.pack() if len(object.Children) > 0: From 3dd421c84c8a439ab226c5317410de53a9c7a138 Mon Sep 17 00:00:00 2001 From: Archie Halliwell Date: Mon, 12 Dec 2022 12:59:26 +1100 Subject: [PATCH 4/4] fix order so it is the same as in master --- channel/channelapp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channel/channelapp/Makefile b/channel/channelapp/Makefile index c569723..eaa0144 100644 --- a/channel/channelapp/Makefile +++ b/channel/channelapp/Makefile @@ -33,7 +33,7 @@ DIR_LIBS = \ $(DEVKITPRO)/libogc/lib/wii \ $(DEVKITPRO)/portlibs/ppc/lib -LIBS = mxml freetype bz2 png z db fat wiiuse bte ogc m +LIBS = mxml freetype png bz2 z db fat wiiuse bte ogc m MACHDEP = -g -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float CFLAGS = $(MACHDEP) -Os -Wall -DBASE_ADDR=$(BASE_ADDR) $(DIR_INCLUDES:%=-I%)