diff --git a/Makefile b/Makefile index 904d0b6..482dbbb 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,8 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map # any extra libraries we wish to link with #--------------------------------------------------------------------------------- LIBS := -lSDL -lfat -lwiiuse -lbte -lasnd -logc -lwiikeyboard \ - -lpng -lvorbisidec -lfreetype -lz + -lpng -lvorbisidec -lfreetype -lz \ + -lm -logg -lbz2 -laesnd #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing diff --git a/src/globals.cpp b/src/globals.cpp new file mode 100644 index 0000000..9dc5a7b --- /dev/null +++ b/src/globals.cpp @@ -0,0 +1,17 @@ +/* + Define DEFINE_GLOBALS if you have undefined reference errors + for font_ttf_size, botton_over_pcm_size, etc. +*/ +//#define DEFINE_GLOBALS + +#ifdef DEFINE_GLOBALS + +#include + +extern const u32 font_ttf_size = 29244; +extern const u32 button_over_pcm_size = 2876; +extern const u32 button_click_pcm_size = 7204; +extern const u32 enter_ogg_size = 59779; +extern const u32 exit_ogg_size = 51898; + +#endif diff --git a/src/platform/wii/menu.cpp b/src/platform/wii/menu.cpp index 7a21399..b6304bd 100644 --- a/src/platform/wii/menu.cpp +++ b/src/platform/wii/menu.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include "libwiigui/gui.h" #include "wiihardware.h" diff --git a/src/platform/wii/missingfunctions.cpp b/src/platform/wii/missingfunctions.cpp index 90bcbce..fb316fc 100644 --- a/src/platform/wii/missingfunctions.cpp +++ b/src/platform/wii/missingfunctions.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "dos_inc.h" static char tmp[MAXPATHLEN]; diff --git a/src/platform/wii/wiihardware.cpp b/src/platform/wii/wiihardware.cpp index 665966e..71a57cd 100644 --- a/src/platform/wii/wiihardware.cpp +++ b/src/platform/wii/wiihardware.cpp @@ -149,7 +149,7 @@ static void * PressKeys (void *arg) 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) { u32 level;