compiles on latest devkitPPC/libogc. Note: crashes as soon as wiimote is

connected with the freetype portlib supplied by devkitPPC. using an
older freetype works.
This commit is contained in:
Daryl Borth 2018-08-02 10:33:25 -06:00
parent 29ce302842
commit 70ce1b8239
3 changed files with 4 additions and 4 deletions

View File

@ -44,7 +44,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map
# any extra libraries we wish to link with the project # any extra libraries we wish to link with the project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := -ldi -liso9660 -lpng -lmxml \ LIBS := -ldi -liso9660 -lpng -lmxml \
-lfat -lwiiuse -lz -lbte -lasnd -logc -lvorbisidec -lfreetype -ltinysmb -lfat -lwiiuse -lz -lbte -lasnd -logc -lvorbisidec -logg -lfreetype -ltinysmb
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing

View File

@ -182,7 +182,7 @@ void ShutdownCB()
{ {
ShutdownRequested = 1; ShutdownRequested = 1;
} }
void ResetCB() void ResetCB(u32 irq, void *ctx)
{ {
ResetRequested = 1; ResetRequested = 1;
} }
@ -292,7 +292,7 @@ bool SaneIOS(u32 ios)
static bool gecko = false; static bool gecko = false;
static mutex_t gecko_mutex = 0; 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)
{ {
if (!gecko || len == 0) if (!gecko || len == 0)
return len; return len;

View File

@ -174,7 +174,7 @@ bool InitializeNetwork(bool silent)
break; break;
} }
#else #else
networkInit = !(if_config(wiiIP, NULL, NULL, true) < 0); networkInit = !(if_config(wiiIP, NULL, NULL, true, 10) < 0);
#endif #endif
CancelAction(); CancelAction();