Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update python3 branch #25

Open
wants to merge 4 commits into
base: python3
Choose a base branch
from
Open

Update python3 branch #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5669aa
fix issue #19
archiecarrot123 Dec 12, 2022
756d483
fix freetype dependencies
archiecarrot123 Dec 12, 2022
09c4ca8
fix TypeError
archiecarrot123 Dec 12, 2022
3dd421c
fix order so it is the same as in master
archiecarrot123 Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion channel/channelapp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%)
Expand Down
1 change: 1 addition & 0 deletions channel/channelapp/stub/cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ distribution.
*/

#include <gctypes.h>
#include <gcbool.h>

#define LC_BASEPREFIX 0xe000
#define LC_BASE (LC_BASEPREFIX<<16)
Expand Down
2 changes: 1 addition & 1 deletion pywii/Alameda/Alameda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down