diff --git a/Makefile.wii b/Makefile.wii index aa4e630..296bd4c 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -44,7 +44,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- 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 diff --git a/source/fceugx.cpp b/source/fceugx.cpp index 1ebb12b..e2439c3 100644 --- a/source/fceugx.cpp +++ b/source/fceugx.cpp @@ -182,7 +182,7 @@ void ShutdownCB() { ShutdownRequested = 1; } -void ResetCB() +void ResetCB(u32 irq, void *ctx) { ResetRequested = 1; } @@ -292,7 +292,7 @@ bool SaneIOS(u32 ios) 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) { if (!gecko || len == 0) return len; diff --git a/source/networkop.cpp b/source/networkop.cpp index fb3f349..d1bcb53 100644 --- a/source/networkop.cpp +++ b/source/networkop.cpp @@ -174,7 +174,7 @@ bool InitializeNetwork(bool silent) break; } #else - networkInit = !(if_config(wiiIP, NULL, NULL, true) < 0); + networkInit = !(if_config(wiiIP, NULL, NULL, true, 10) < 0); #endif CancelAction();