diff --git a/channel/channelapp/Makefile b/channel/channelapp/Makefile index 31c6a67..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 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%) 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) 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: