Updated the Makefile to the new build system.

Introduced a Makefile variable to build a gamecube version.

svn-id: r33723
This commit is contained in:
Andre Heider 2008-08-09 20:02:56 +00:00
parent 3e5e5f5342
commit c60565e108
3 changed files with 80 additions and 45 deletions

View file

@ -1,26 +1,32 @@
# this enables port specific debug messages and redirects stdout/err over
# usbgecko in memcard slot b
DEBUG_WII = 1
ENABLE_SCUMM = 1
ENABLE_SCUMM_7_8 = 1
ENABLE_HE = 1
# ENABLE_AGI = 1
ENABLE_AGOS = 1
ENABLE_CINE = 1
ENABLE_CRUISE = 1
ENABLE_DRASCULA = 1
ENABLE_GOB = 1
ENABLE_IGOR = 1
ENABLE_KYRA = 1
ENABLE_LURE = 1
ENABLE_M4 = 1
ENABLE_MADE = 1
ENABLE_PARALLACTION = 1
ENABLE_QUEEN = 1
ENABLE_SAGA = 1
ENABLE_SKY = 1
ENABLE_SWORD1 = 1
ENABLE_SWORD2 = 1
ENABLE_TOUCHE = 1
# builds a gamecube version. cleanup object files before flipping this
GAMECUBE = 0
ENABLE_SCUMM = STATIC_PLUGIN
ENABLE_SCUMM_7_8 = STATIC_PLUGIN
ENABLE_HE = STATIC_PLUGIN
# ENABLE_AGI = STATIC_PLUGIN
ENABLE_AGOS = STATIC_PLUGIN
ENABLE_CINE = STATIC_PLUGIN
ENABLE_CRUISE = STATIC_PLUGIN
ENABLE_DRASCULA = STATIC_PLUGIN
ENABLE_GOB = STATIC_PLUGIN
ENABLE_IGOR = STATIC_PLUGIN
ENABLE_KYRA = STATIC_PLUGIN
ENABLE_LURE = STATIC_PLUGIN
ENABLE_M4 = STATIC_PLUGIN
ENABLE_MADE = STATIC_PLUGIN
ENABLE_PARALLACTION = STATIC_PLUGIN
ENABLE_QUEEN = STATIC_PLUGIN
ENABLE_SAGA = STATIC_PLUGIN
ENABLE_SKY = STATIC_PLUGIN
ENABLE_SWORD1 = STATIC_PLUGIN
ENABLE_SWORD2 = STATIC_PLUGIN
ENABLE_TINSEL = STATIC_PLUGIN
ENABLE_TOUCHE = STATIC_PLUGIN
DISABLE_HQ_SCALERS = 1
DISABLE_SCALERS = 1
@ -30,7 +36,11 @@ USE_MAD = 1
USE_TREMOR = 1
USE_FLAC = 1
USE_MPEG2 = 1
ifeq ($(GAMECUBE),1)
USE_MT32EMU = 0
else
USE_MT32EMU = 1
endif
srcdir = ../../..
VPATH = $(srcdir)
@ -54,21 +64,28 @@ MKDIR = mkdir -p
RM = rm -f
CP = cp -f
ifeq ($(GAMECUBE),1)
TARGET = scummvm-gc
MACHDEP = -DGEKKO -DGAMECUBE -mogc -mcpu=750 -meabi -mhard-float \
-ffunction-sections -fdata-sections -fmodulo-sched
LIBDIR = $(DEVKITPRO)/libogc/lib/cube
LIBS = -lstdc++ -lfat -logc -lm
else
TARGET = scummvm-wii
MACHDEP = -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float \
-ffunction-sections -fdata-sections -fmodulo-sched
LIBDIR = $(DEVKITPRO)/libogc/lib/wii
LIBS = -lstdc++ -lfat -lwiiuse -lbte -logc -lm
endif
INCDIR = $(srcdir) . $(srcdir)/engines/ $(DEVKITPRO)/libogc/include
LIBDIR = $(DEVKITPRO)/libogc/lib/wii
CXXFLAGS = -g -Os -Wall $(MACHDEP) -D__WII__ -Wno-multichar -Wno-long-long \
-Wno-unknown-pragmas -Wno-reorder -fno-exceptions -fno-rtti
-Wno-unknown-pragmas -Wno-reorder -fno-exceptions -fno-rtti
CXXFLAGS += $(addprefix -I,$(INCDIR))
LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(TARGET).elf.map
LDFLAGS += $(addprefix -L,$(LIBDIR))
LIBS = -lstdc++ -lfat -lwiiuse -lbte -logc -lm
CXXFLAGS += -I$(DEVKITPRO)/3rd/wii/include
LDFLAGS += -L$(DEVKITPRO)/3rd/wii/lib
@ -137,20 +154,26 @@ distclean: distclean-wii
distclean-wii:
@-$(RM) dist
ifeq ($(GAMECUBE),1)
upload:
$(DEVKITPPC)/bin/wiiload $(TARGET).dol
endif
dist:
$(MKDIR) dist/apps/scummvm
$(CP) $(TARGET).dol dist/apps/scummvm/boot.dol
$(CP) $(DISTPATH)/meta.xml dist/apps/scummvm/
$(CP) $(DISTPATH)/icon.png dist/apps/scummvm/
$(CP) $(DISTPATH)/READMII dist/apps/scummvm/
$(CP) $(srcdir)/AUTHORS dist/apps/scummvm/
$(CP) $(srcdir)/COPYING dist/apps/scummvm/
$(CP) $(srcdir)/COPYRIGHT dist/apps/scummvm/
$(CP) $(srcdir)/NEWS dist/apps/scummvm/
$(CP) $(srcdir)/README dist/apps/scummvm/
$(CP) $(DIST_FILES_THEMES) dist/apps/scummvm/
$(CP) $(DIST_FILES_ENGINEDATA) dist/apps/scummvm/
$(MKDIR) dist/scummvm
ifeq ($(GAMECUBE),1)
$(CP) $(TARGET).dol dist/scummvm/
else
$(CP) $(TARGET).dol dist/scummvm/boot.dol
$(CP) $(DISTPATH)/meta.xml dist/scummvm/
$(CP) $(DISTPATH)/icon.png dist/scummvm/
$(CP) $(DISTPATH)/READMII dist/scummvm/
$(CP) $(srcdir)/AUTHORS dist/scummvm/
$(CP) $(srcdir)/COPYING dist/scummvm/
$(CP) $(srcdir)/COPYRIGHT dist/scummvm/
$(CP) $(srcdir)/NEWS dist/scummvm/
$(CP) $(srcdir)/README dist/scummvm/
$(CP) $(DIST_FILES_THEMES) dist/scummvm/
$(CP) $(DIST_FILES_ENGINEDATA) dist/scummvm/
endif

View file

@ -62,7 +62,9 @@ int main(int argc, char *argv[]) {
printf("startup\n");
SYS_SetResetCallback(reset_cb);
#ifndef GAMECUBE
SYS_SetPowerCallback(power_cb);
#endif
if (!fatInitDefault()) {
printf("fatInitDefault failed\n");
@ -75,7 +77,7 @@ int main(int argc, char *argv[]) {
if (!strcmp(buf, "fat:/"))
chdir("/apps/scummvm");
//fatEnableReadAhead(PI_DEFAULT, 32, 128);
fatEnableReadAhead(PI_DEFAULT, 32, 128);
}
g_system = new OSystem_Wii();

View file

@ -6,12 +6,18 @@ features not compiled in:
REQUIREMENTS
- sd card
- wiimote or gamecube controller in port 1
wii:
- sd card
- wiimote or gamecube controller in port 1
gamecube:
- sd card
- sd gecko adapter
- gamecube controller in port 1
INSTALL
- copy the "apps" folder to the root of your sd card
- copy the "scummvm" folder into the "/apps" folder of your sd card
- copy your demos and/or games onto the same sd card
each game goes into its own subdirectory, do not place those under
"/apps/scummvm", and do not set the "theme" or "extra" path to that folder
@ -20,17 +26,21 @@ INSTALL
RUN
either use the homebrew channel, available at
wii:
either use the homebrew channel, available at
http://hbc.hackmii.com/
http://hbc.hackmii.com/
or load "boot.dol" with your favorite loader
or load "/apps/scummvm/boot.dol" with your favorite loader
gamecube:
load "/apps/scummvm/scummvm-gc.dol" with your favorite loader
CONTROLS
wiimote
analog stick: mouse movement
IR: mouse movement
a: left mouse button
b: right mouse button
minus: escape