The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-25 21:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make it build for the Wii again. No, it won't run.

Browse Source
This commit is contained in:
simon.kagstrom 2010-02-06 16:10:09 +00:00
parent c1a7977ba3
commit 853bed122e
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.wii
View File

@ -27,7 +27,7 @@ INCLUDES :=
PCFLAGS = -DPRECISE_CPU_CYCLES=1 -DPRECISE_CIA_CYCLES=1 -DPC_IS_POINTER=0 PCFLAGS = -DPRECISE_CPU_CYCLES=1 -DPRECISE_CIA_CYCLES=1 -DPC_IS_POINTER=0
SCFLAGS = $(PCFLAGS) -DFRODO_SC SCFLAGS = $(PCFLAGS) -DFRODO_SC
CFLAGS = -O3 -g -Wall $(MACHDEP) $(INCLUDE) -U__unix -DHAVE_SDL $(SCFLAGS) -I$(LIBOGC_INC)/SDL CFLAGS = -O3 -g -Wall $(MACHDEP) $(INCLUDE) -U__unix -DHAVE_SDL $(SCFLAGS) -I$(LIBOGC_INC)/SDL -I$(PWD)/Src/
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map
@ -35,7 +35,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 := -lSDL_ttf -lz -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard LIBS := -lSDL_ttf -lSDL_image -lpng -ljpeg -lz -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing
@ -60,11 +60,15 @@ export DEPSDIR := $(CURDIR)/$(BUILD)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# automatically build a list of object files for our project # automatically build a list of object files for our project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
CFILES := gcaudio.c menutexts.c d64-read.c CFILES := gcaudio.c d64-read.c
CPPFILES := Display.cpp main.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541fs.cpp \ CPPFILES := Display.cpp main.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541fs.cpp \
1541d64.cpp 1541t64.cpp 1541job.cpp C64_SC.cpp CPUC64_SC.cpp VIC_SC.cpp \ 1541d64.cpp 1541t64.cpp 1541job.cpp C64_SC.cpp CPUC64_SC.cpp VIC_SC.cpp \
CIA_SC.cpp CPU1541_SC.cpp menu.cpp CPU_common.cpp VirtualKeyboard.cpp \ CIA_SC.cpp CPU1541_SC.cpp CPU_common.cpp \
Network.cpp Network.cpp gui/dialogue_box.cpp gui/widget.cpp utils.cpp \
gui/game_info.cpp gui/status_bar.cpp gui/gui.cpp gui/listener.cpp \
timer.cpp utils.cpp gui/virtual_keyboard.cpp gui/menu.cpp \
gui/file_browser.cpp data_store.cpp gui/menu_messages.cpp
sFILES := sFILES :=
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S))) SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
@ -101,8 +105,8 @@ export OUTPUT := $(CURDIR)/$(TARGET)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
$(BUILD): $(BUILD):
@[ -d $@ ] || mkdir -p $@ @[ -d $@ ] || mkdir -p $@ $@/gui
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@ -116,6 +120,7 @@ dist: $(BUILD)
install -d $@/apps/frodo/saves install -d $@/apps/frodo/saves
install -d $@/apps/frodo/tmp install -d $@/apps/frodo/tmp
cp $(TARGET).dol $@/apps/frodo/boot.dol cp $(TARGET).dol $@/apps/frodo/boot.dol
cp -rap themes $@/apps/frodo/themes
cp meta.xml $@/apps/frodo/ cp meta.xml $@/apps/frodo/
cp icon.png $@/apps/frodo/ cp icon.png $@/apps/frodo/
cp FreeMono.ttf $@/apps/frodo/ cp FreeMono.ttf $@/apps/frodo/

6
Src/gui/gui.cpp
View File

@ -1,6 +1,10 @@
#include <SDL_image.h> #include <SDL_image.h>
#include <SDL_ttf.h> #include <SDL_ttf.h>
#include <arpa/inet.h> #if defined(GEKKO)
# include <network.h>
#else
# include <arpa/inet.h>
#endif
#include <utils.hh> #include <utils.hh>

5
Src/main_wii.h
View File

@ -7,10 +7,13 @@
#include "Version.h" #include "Version.h"
#include <SDL.h> #include <SDL.h>
#include <SDL_ttf.h>
#include <fat.h> #include <fat.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include <network.h> #include <network.h>
#include "gui/gui.hh"
extern int init_graphics(void); extern int init_graphics(void);
/* /*
@ -47,7 +50,6 @@ extern "C" int main(int argc, char **argv)
fprintf(stderr, "Unable to init TTF: %s\n", TTF_GetError() ); fprintf(stderr, "Unable to init TTF: %s\n", TTF_GetError() );
return 0; return 0;
} }
menu_init();
if (WPAD_Init() != WPAD_ERR_NONE) if (WPAD_Init() != WPAD_ERR_NONE)
{ {
@ -97,6 +99,7 @@ void Frodo::ReadyToRun(void)
// Create and start C64 // Create and start C64
TheC64 = new C64; TheC64 = new C64;
Gui::init();
load_rom_files(); load_rom_files();
TheC64->Run(); TheC64->Run();
delete TheC64; delete TheC64;

6
Src/sysdeps.h
View File

@ -19,7 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "sysconfig.h" #if defined(GEKKO)
# include "sysconfig.h.Wii"
#else
# include "sysconfig.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>