The-Homebrew-Cloud/dosbox-wii
2
0
Fork 0
mirror of https://github.com/retro100/dosbox-wii.git synced 2025-01-15 03:39:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix1: Small changes for update to current devkitPro/libogc version.

Browse Source
This commit is contained in:
retro100 2021-04-22 14:52:39 +02:00
parent c9fc90cc15
commit b50c3013ea
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -9,6 +9,11 @@ endif
include $(DEVKITPPC)/wii_rules include $(DEVKITPPC)/wii_rules
# override the bin2o definition for disable header creation
define bin2o
bin2s -a 32 $< | $(AS) -o $(<F).o
endef
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# TARGET is the name of the output # TARGET is the name of the output
# BUILD is the directory where object files & intermediate files will be placed # BUILD is the directory where object files & intermediate files will be placed
@ -37,7 +42,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map
# any extra libraries we wish to link with # any extra libraries we wish to link with
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := -lSDL -lfat -lwiiuse -lbte -lasnd -logc -lwiikeyboard \ LIBS := -lSDL -lfat -lwiiuse -lbte -lasnd -logc -lwiikeyboard \
-lpng -lvorbisidec -lfreetype -lz -lpng -lvorbisidec -logg -lfreetype -lbz2 -lz
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing
@ -91,7 +96,7 @@ export OFILES := $(addsuffix .o,$(BINFILES)) \
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD) \ -I$(CURDIR)/$(BUILD) \
-I$(LIBOGC_INC) -I$(LIBOGC_INC)/SDL -I$(PORTLIBS)/include/freetype2 -I$(LIBOGC_INC) -I$(PORTLIBS_PATH)/wii/include/SDL -I$(PORTLIBS_PATH)/ppc/include/freetype2
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of library paths # build a list of library paths

1
src/platform/wii/menu.cpp
View File

@ -14,6 +14,7 @@
#include <string.h> #include <string.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h>
#include <unistd.h> #include <unistd.h>
#include "libwiigui/gui.h" #include "libwiigui/gui.h"

1
src/platform/wii/missingfunctions.cpp
View File

@ -4,6 +4,7 @@
#include <errno.h> #include <errno.h>
#include <libgen.h> #include <libgen.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h>
#include "dos_inc.h" #include "dos_inc.h"
static char tmp[MAXPATHLEN]; static char tmp[MAXPATHLEN];

2
src/platform/wii/wiihardware.cpp
View File

@ -149,7 +149,7 @@ static void * PressKeys (void *arg)
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)
{ {
u32 level; u32 level;