Fix compilation

This commit is contained in:
piratesephiroth 2020-11-13 05:58:34 -03:00
parent 06b2b26a6b
commit 647f36dc93
3 changed files with 72 additions and 71 deletions

View File

@ -23,6 +23,7 @@ SOURCES := src \
src/utils
DATA := data
INCLUDES := src
$(WUT_ROOT)\usr
#-------------------------------------------------------------------------------
# options for code generation
@ -43,7 +44,7 @@ LIBS := -lxml2 -lz -liosuhax -lwut
# list of directories containing libraries, this must be the top level
# containing include and lib
#-------------------------------------------------------------------------------
LIBDIRS := $(PORTLIBS) $(WUT_ROOT)
LIBDIRS := $(PORTLIBS) $(WUT_ROOT) $(WUT_ROOT)\usr
#-------------------------------------------------------------------------------
# no real need to edit anything past this point unless you need to add additional

View File

@ -3,7 +3,7 @@
# Automatic resource file list generation
# Created by Dimok
outFile="./src/ziplist.h"
outFile="./src/zipList.h"
count_old=$(cat $outFile 2>/dev/null | tr -d '\n\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
count=0
@ -29,7 +29,7 @@ fi
if [ "$count_old" != "$count" ] || [ ! -f $outFile ]
then
echo "Generating filelist.h for $count files." >&2
echo "Generating zipList.h for $count files." >&2
cat <<EOF > $outFile
/****************************************************************************
* This file is generated automatically.
@ -47,8 +47,8 @@ for i in ${files[@]}
do
filename=${i%.*}
extension=${i##*.}
echo 'extern const unsigned char '$filename'_'$extension'[];' >> $outFile
echo 'extern const unsigned int '$filename'_'$extension'_size;' >> $outFile
echo 'const unsigned char '$filename'__'$extension'[];' >> $outFile
echo 'const unsigned int '$filename'__'$extension'_size;' >> $outFile
echo '' >> $outFile
done

View File

@ -12,93 +12,93 @@ typedef struct _gList_t {
} gList_t;
gList_t GameList[] = {
{ 0x10179A00, "Kawashima: Motto Nou wo Kitaeru Otona no DS Training [JPN]", brainage_zip, &brainage_zip_size },
{ 0x10179B00, "Brain Age: Train Your Brain in Minutes a Day! [USA]", brainage_zip, &brainage_zip_size },
{ 0x10179C00, "Dr. Kawashima's Brain Training [PAL]", brainage_zip, &brainage_zip_size },
{ 0x10179A00, "Kawashima: Motto Nou wo Kitaeru Otona no DS Training [JPN]", brainage__zip, &brainage__zip_size },
{ 0x10179B00, "Brain Age: Train Your Brain in Minutes a Day! [USA]", brainage__zip, &brainage__zip_size },
{ 0x10179C00, "Dr. Kawashima's Brain Training [PAL]", brainage__zip, &brainage__zip_size },
{ 0x10179D00, "Catch! Touch! Yoshi! [JPN]", yoshitouchandgo_zip, &yoshitouchandgo_zip_size },
{ 0x10179E00, "Yoshi Touch & Go [USA]", yoshitouchandgo_zip, &yoshitouchandgo_zip_size },
{ 0x10179F00, "Yoshi Touch & Go [PAL]", yoshitouchandgo_zip, &yoshitouchandgo_zip_size },
{ 0x10179D00, "Catch! Touch! Yoshi! [JPN]", yoshitouchandgo__zip, &yoshitouchandgo__zip_size },
{ 0x10179E00, "Yoshi Touch & Go [USA]", yoshitouchandgo__zip, &yoshitouchandgo__zip_size },
{ 0x10179F00, "Yoshi Touch & Go [PAL]", yoshitouchandgo__zip, &yoshitouchandgo__zip_size },
{ 0x10195600, "Mario Kart DS [JPN]", mariokartds_zip, &mariokartds_zip_size },
{ 0x10195700, "Mario Kart DS [USA]", mariokartds_zip, &mariokartds_zip_size },
{ 0x10195800, "Mario Kart DS [PAL]", mariokartds_zip, &mariokartds_zip_size },
{ 0x10195600, "Mario Kart DS [JPN]", mariokartds__zip, &mariokartds__zip_size },
{ 0x10195700, "Mario Kart DS [USA]", mariokartds__zip, &mariokartds__zip_size },
{ 0x10195800, "Mario Kart DS [PAL]", mariokartds__zip, &mariokartds__zip_size },
{ 0x10195900, "New Super Mario Bros. [JPN]", newsmb_zip, &newsmb_zip_size },
{ 0x10195A00, "New Super Mario Bros. [USA]", newsmb_zip, &newsmb_zip_size },
{ 0x10195B00, "New Super Mario Bros. [PAL]", newsmb_eur_zip, &newsmb_eur_zip_size },
{ 0x10195900, "New Super Mario Bros. [JPN]", newsmb__zip, &newsmb__zip_size },
{ 0x10195A00, "New Super Mario Bros. [USA]", newsmb__zip, &newsmb__zip_size },
{ 0x10195B00, "New Super Mario Bros. [PAL]", newsmb_eur__zip, &newsmb_eur__zip_size },
{ 0x10198800, "Yoshi's Island DS [JPN]", yoshids_zip, &yoshids_zip_size },
{ 0x10198900, "Yoshi's Island DS [USA]", yoshids_zip, &yoshids_zip_size },
{ 0x10198A00, "Yoshi's Island DS [PAL]", yoshids_zip, &yoshids_zip_size },
{ 0x10198800, "Yoshi's Island DS [JPN]", yoshids__zip, &yoshids__zip_size },
{ 0x10198900, "Yoshi's Island DS [USA]", yoshids__zip, &yoshids__zip_size },
{ 0x10198A00, "Yoshi's Island DS [PAL]", yoshids__zip, &yoshids__zip_size },
{ 0x10198B00, "Yawaraka Atama Juku [JPN]", bigbrainacademy_zip, &bigbrainacademy_zip_size },
{ 0x10198C00, "Big Brain Academy [USA]", bigbrainacademy_zip, &bigbrainacademy_zip_size },
{ 0x10198D00, "Big Brain Academy [PAL]", bigbrainacademy_zip, &bigbrainacademy_zip_size },
{ 0x10198B00, "Yawaraka Atama Juku [JPN]", bigbrainacademy__zip, &bigbrainacademy__zip_size },
{ 0x10198C00, "Big Brain Academy [USA]", bigbrainacademy__zip, &bigbrainacademy__zip_size },
{ 0x10198D00, "Big Brain Academy [PAL]", bigbrainacademy__zip, &bigbrainacademy__zip_size },
{ 0x101A1E00, "Sawaru: Made in Wario [JPN]", wwtouched_zip, &wwtouched_zip_size },
{ 0x101A1F00, "WarioWare: Touched! [USA]", wwtouched_zip, &wwtouched_zip_size },
{ 0x101A2000, "WarioWare: Touched! [PAL]", wwtouched_zip, &wwtouched_zip_size },
{ 0x101A1E00, "Sawaru: Made in Wario [JPN]", wwtouched__zip, &wwtouched__zip_size },
{ 0x101A1F00, "WarioWare: Touched! [USA]", wwtouched__zip, &wwtouched__zip_size },
{ 0x101A2000, "WarioWare: Touched! [PAL]", wwtouched__zip, &wwtouched__zip_size },
{ 0x101A2100, "Mario & Luigi RPG 2x2 [JPN]", partnersintime_zip, &partnersintime_zip_size },
{ 0x101A2200, "Mario & Luigi: Partners in Time [USA]", partnersintime_zip, &partnersintime_zip_size },
{ 0x101A2300, "Mario & Luigi: Partners in Time [PAL]", partnersintime_zip, &partnersintime_zip_size },
{ 0x101A2100, "Mario & Luigi RPG 2x2 [JPN]", partnersintime__zip, &partnersintime__zip_size },
{ 0x101A2200, "Mario & Luigi: Partners in Time [USA]", partnersintime__zip, &partnersintime__zip_size },
{ 0x101A2300, "Mario & Luigi: Partners in Time [PAL]", partnersintime__zip, &partnersintime__zip_size },
{ 0x101A5200, "Donkey Kong: Jungle Climber [JPN]", dkjclimber_zip, &dkjclimber_zip_size },
{ 0x101A5300, "DK: Jungle Climber [USA]", dkjclimber_zip, &dkjclimber_zip_size },
{ 0x101A5400, "Donkey Kong: Jungle Climber [PAL]", dkjclimber_zip, &dkjclimber_zip_size },
{ 0x101A5200, "Donkey Kong: Jungle Climber [JPN]", dkjclimber__zip, &dkjclimber__zip_size },
{ 0x101A5300, "DK: Jungle Climber [USA]", dkjclimber__zip, &dkjclimber__zip_size },
{ 0x101A5400, "Donkey Kong: Jungle Climber [PAL]", dkjclimber__zip, &dkjclimber__zip_size },
{ 0x101A5500, "Hoshi no Kirby: Sanjou! Dorocche Dan [JPN]", kirby_zip, &kirby_zip_size },
{ 0x101A5600, "Kirby: Squeak Squad [USA]", kirby_zip, &kirby_zip_size },
{ 0x101A5700, "Kirby: Mouse Attack [PAL]", kirby_zip, &kirby_zip_size },
{ 0x101A5500, "Hoshi no Kirby: Sanjou! Dorocche Dan [JPN]", kirby__zip, &kirby__zip_size },
{ 0x101A5600, "Kirby: Squeak Squad [USA]", kirby__zip, &kirby__zip_size },
{ 0x101A5700, "Kirby: Mouse Attack [PAL]", kirby__zip, &kirby__zip_size },
{ 0x101ABD00, "Kaitou Wario the Seven [JPN]", masterofdisguise_zip, &masterofdisguise_zip_size },
{ 0x101ABE00, "Wario: Master of Disguise [USA]", masterofdisguise_zip, &masterofdisguise_zip_size },
{ 0x101ABF00, "Wario: Master of Disguise [PAL]", masterofdisguise_zip, &masterofdisguise_zip_size },
{ 0x101ABD00, "Kaitou Wario the Seven [JPN]", masterofdisguise__zip, &masterofdisguise__zip_size },
{ 0x101ABE00, "Wario: Master of Disguise [USA]", masterofdisguise__zip, &masterofdisguise__zip_size },
{ 0x101ABF00, "Wario: Master of Disguise [PAL]", masterofdisguise__zip, &masterofdisguise__zip_size },
{ 0x101AC000, "Star Fox Command [JPN]", sfcommand_zip, &sfcommand_zip_size },
{ 0x101AC100, "Star Fox Command [USA]", sfcommand_zip, &sfcommand_zip_size },
{ 0x101AC200, "Star Fox Command [PAL]", sfcommand_zip, &sfcommand_zip_size },
{ 0x101AC000, "Star Fox Command [JPN]", sfcommand__zip, &sfcommand__zip_size },
{ 0x101AC100, "Star Fox Command [USA]", sfcommand__zip, &sfcommand__zip_size },
{ 0x101AC200, "Star Fox Command [PAL]", sfcommand__zip, &sfcommand__zip_size },
{ 0x101B8800, "Touch! Kirby's Magic Paintbrush [JPN]", kirbycanvascurse_zip, &kirbycanvascurse_zip_size },
{ 0x101B8900, "Kirby: Canvas Curse [USA]", kirbycanvascurse_zip, &kirbycanvascurse_zip_size },
{ 0x101B8A00, "Kirby: Power Paintbrush [PAL]", kirbycanvascurse_zip, &kirbycanvascurse_zip_size },
{ 0x101B8800, "Touch! Kirby's Magic Paintbrush [JPN]", kirbycanvascurse__zip, &kirbycanvascurse__zip_size },
{ 0x101B8900, "Kirby: Canvas Curse [USA]", kirbycanvascurse__zip, &kirbycanvascurse__zip_size },
{ 0x101B8A00, "Kirby: Power Paintbrush [PAL]", kirbycanvascurse__zip, &kirbycanvascurse__zip_size },
{ 0x101B8B00, "Zelda no Densetsu: Daichi no Kiteki [JPN]", zeldast_zip, &zeldast_zip_size },
{ 0x101B8C00, "The Legend of Zelda: Spirit Tracks [USA]", zeldast_zip, &zeldast_zip_size },
{ 0x101B8D00, "The Legend of Zelda: Spirit Tracks [PAL]", zeldast_zip, &zeldast_zip_size },
{ 0x101B8B00, "Zelda no Densetsu: Daichi no Kiteki [JPN]", zeldast__zip, &zeldast__zip_size },
{ 0x101B8C00, "The Legend of Zelda: Spirit Tracks [USA]", zeldast__zip, &zeldast__zip_size },
{ 0x101B8D00, "The Legend of Zelda: Spirit Tracks [PAL]", zeldast__zip, &zeldast__zip_size },
{ 0x101C3300, "Super Mario 64 DS [JPN]", sm64ds_zip, &sm64ds_zip_size },
{ 0x101C3400, "Super Mario 64 DS [USA]", sm64ds_zip, &sm64ds_zip_size },
{ 0x101C3500, "Super Mario 64 DS [PAL]", sm64ds_zip, &sm64ds_zip_size },
{ 0x101C3300, "Super Mario 64 DS [JPN]", sm64ds__zip, &sm64ds__zip_size },
{ 0x101C3400, "Super Mario 64 DS [USA]", sm64ds__zip, &sm64ds__zip_size },
{ 0x101C3500, "Super Mario 64 DS [PAL]", sm64ds__zip, &sm64ds__zip_size },
{ 0x101C3600, "Zelda no Densetsu: Mugen no Sunadokei [JPN]", zeldaph_zip, &zeldaph_zip_size },
{ 0x101C3700, "The Legend of Zelda: Phantom Hourglass [USA]", zeldaph_zip, &zeldaph_zip_size },
{ 0x101C3800, "The Legend of Zelda: Phantom Hourglass [PAL]", zeldaph_zip, &zeldaph_zip_size },
{ 0x101C3600, "Zelda no Densetsu: Mugen no Sunadokei [JPN]", zeldaph__zip, &zeldaph__zip_size },
{ 0x101C3700, "The Legend of Zelda: Phantom Hourglass [USA]", zeldaph__zip, &zeldaph__zip_size },
{ 0x101C3800, "The Legend of Zelda: Phantom Hourglass [PAL]", zeldaph__zip, &zeldaph__zip_size },
{ 0x101C8600, "Atsumete! Kirby [JPN]", kirbymassattack_zip, &kirbymassattack_zip_size },
{ 0x101C8700, "Kirby Mass Attack [USA]", kirbymassattack_zip, &kirbymassattack_zip_size },
{ 0x101C8800, "Kirby Mass Attack [PAL]", kirbymassattack_zip, &kirbymassattack_zip_size },
{ 0x101C8600, "Atsumete! Kirby [JPN]", kirbymassattack__zip, &kirbymassattack__zip_size },
{ 0x101C8700, "Kirby Mass Attack [USA]", kirbymassattack__zip, &kirbymassattack__zip_size },
{ 0x101C8800, "Kirby Mass Attack [PAL]", kirbymassattack__zip, &kirbymassattack__zip_size },
{ 0x101CC200, "Pokemon Ranger [JPN]", pokemonranger_zip, &pokemonranger_zip_size },
{ 0x101CC300, "Pokemon Ranger [USA]", pokemonranger_zip, &pokemonranger_zip_size },
{ 0x101CC400, "Pokemon Ranger [PAL]", pokemonranger_zip, &pokemonranger_zip_size },
{ 0x101CC200, "Pokemon Ranger [JPN]", pokemonranger__zip, &pokemonranger__zip_size },
{ 0x101CC300, "Pokemon Ranger [USA]", pokemonranger__zip, &pokemonranger__zip_size },
{ 0x101CC400, "Pokemon Ranger [PAL]", pokemonranger__zip, &pokemonranger__zip_size },
{ 0x101D1F00, "Oideyo Doubutsu no Mori [JPN]", animalcrossing_zip, &animalcrossing_zip_size },
{ 0x101D2000, "Animal Crossing: Wild World [USA]", animalcrossing_zip, &animalcrossing_zip_size },
{ 0x101D2100, "Animal Crossing: Wild World [PAL]", animalcrossing_zip, &animalcrossing_zip_size },
{ 0x101D1F00, "Oideyo Doubutsu no Mori [JPN]", animalcrossing__zip, &animalcrossing__zip_size },
{ 0x101D2000, "Animal Crossing: Wild World [USA]", animalcrossing__zip, &animalcrossing__zip_size },
{ 0x101D2100, "Animal Crossing: Wild World [PAL]", animalcrossing__zip, &animalcrossing__zip_size },
{ 0x101E0C00, "Pokemon Fushigi no Dungeon: Sora no Tankentai [JPN]", explorersofsky_zip, &explorersofsky_zip_size },
{ 0x101E0D00, "Pokemon Mystery Dungeon: Explorers of Sky [USA]", explorersofsky_zip, &explorersofsky_zip_size },
{ 0x101E0E00, "Pokemon Mystery Dungeon: Explorers of Sky [PAL]", explorersofsky_zip, &explorersofsky_zip_size },
{ 0x101E0C00, "Pokemon Fushigi no Dungeon: Sora no Tankentai [JPN]", explorersofsky__zip, &explorersofsky__zip_size },
{ 0x101E0D00, "Pokemon Mystery Dungeon: Explorers of Sky [USA]", explorersofsky__zip, &explorersofsky__zip_size },
{ 0x101E0E00, "Pokemon Mystery Dungeon: Explorers of Sky [PAL]", explorersofsky__zip, &explorersofsky__zip_size },
{ 0x101E0F00, "Pokemon Ranger: Batonnage [JPN]", shadowsofalmia_zip, &shadowsofalmia_zip_size },
{ 0x101E1000, "Pokemon Ranger: Shadows of Almia [USA]", shadowsofalmia_zip, &shadowsofalmia_zip_size },
{ 0x101E1100, "Pokemon Ranger: Shadows of Almia [PAL]", shadowsofalmia_zip, &shadowsofalmia_zip_size },
{ 0x101E0F00, "Pokemon Ranger: Batonnage [JPN]", shadowsofalmia__zip, &shadowsofalmia__zip_size },
{ 0x101E1000, "Pokemon Ranger: Shadows of Almia [USA]", shadowsofalmia__zip, &shadowsofalmia__zip_size },
{ 0x101E1100, "Pokemon Ranger: Shadows of Almia [PAL]", shadowsofalmia__zip, &shadowsofalmia__zip_size },
{ 0x101E6F00, "Pokemon Ranger: Hikari no Kiseki [JPN]", guardiansigns_zip, &guardiansigns_zip_size },
{ 0x101E7000, "Pokemon Ranger: Guardian Signs [USA]", guardiansigns_zip, &guardiansigns_zip_size },
{ 0x101E7100, "Pokemon Ranger: Guardian Signs [PAL]", guardiansigns_zip, &guardiansigns_zip_size },
{ 0x101E6F00, "Pokemon Ranger: Hikari no Kiseki [JPN]", guardiansigns__zip, &guardiansigns__zip_size },
{ 0x101E7000, "Pokemon Ranger: Guardian Signs [USA]", guardiansigns__zip, &guardiansigns__zip_size },
{ 0x101E7100, "Pokemon Ranger: Guardian Signs [PAL]", guardiansigns__zip, &guardiansigns__zip_size },
};
static const int GameListSize = sizeof(GameList) / sizeof(gList_t);