Fixed loading wave files, Version 9 Release

This commit is contained in:
fabio.olimpieri 2012-04-21 08:48:26 +00:00
parent e1cf346493
commit dd26998796
6 changed files with 19 additions and 9 deletions

View File

@ -1,3 +1,10 @@
version 9:
* Added dms and zip support
* Added drive sound
* (build) Compiled against libogc 1.8.9
-- Fabio Olimpieri <fabio.olimpieri@tin.it>, Apr 21 CEST 2012
version 8: version 8:
* Added rumble support * Added rumble support
* Added configurable aspect ratio * Added configurable aspect ratio

View File

@ -147,7 +147,7 @@ DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THRE
-DTD_START_HEIGHT=16 -DDRIVESOUND -DTD_START_HEIGHT=16 -DDRIVESOUND
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
#unused defines; -DFDI2RAW #unused defines; -DCAPS (to enable ipf file) -DFDI2RAW (to enable DFI file)
# Test link flags. # Test link flags.
LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(PORTLIBS)/lib -L$(DEVKITPRO)/libogc/lib -L$(DEVKITPRO)/libogc/lib/wii -lz -lSDL_ttf -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard -ltinysmb LDFLAGS := $(COMMON_FLAGS) -L$(LIB_DIR) -L$(PORTLIBS)/lib -L$(DEVKITPRO)/libogc/lib -L$(DEVKITPRO)/libogc/lib/wii -lz -lSDL_ttf -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard -ltinysmb
@ -161,6 +161,7 @@ dist:uae.dol
install -d $@/uae/harddisks install -d $@/uae/harddisks
install -d $@/uae/harddir install -d $@/uae/harddir
install -d $@/uae/saves install -d $@/uae/saves
install -d $@/uae/wave
echo "dummy" > $@/uae/roms/put-your-kick-dot-rom-here echo "dummy" > $@/uae/roms/put-your-kick-dot-rom-here
echo "dummy" > $@/uae/floppies/dummy echo "dummy" > $@/uae/floppies/dummy
echo "dummy" > $@/uae/harddisks/dummy echo "dummy" > $@/uae/harddisks/dummy
@ -176,6 +177,7 @@ dist:uae.dol
cp uaerc.smb $@/uae/ cp uaerc.smb $@/uae/
cp docs/configuration.txt $@/apps/uae/ cp docs/configuration.txt $@/apps/uae/
cp docs/Joystick_mapping.txt $@/apps/uae/ cp docs/Joystick_mapping.txt $@/apps/uae/
cp src/resource/*.wav $@/uae/wave
cd $@ && tar -czf ../uae-wii-bin.tar.gz * cd $@ && tar -czf ../uae-wii-bin.tar.gz *
distsource: distsource:

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name>UAE</name> <name>UAE</name>
<coder>Simon Kagstrom</coder> <coder>Simon Kagstrom</coder>
<version>8</version> <version>9</version>
<release_date>20111231</release_date> <release_date>21120421</release_date>
<short_description>Amiga emulator</short_description> <short_description>Amiga emulator</short_description>
<long_description>UAE is an Amiga emulator written by Bernd Schmidt et al, see http://amigaemulator.org. The port to Wii was done by Simon Kagstrom, with help from Christopher Follett, "Knitax" and Fabio Olimpieri (Oibaf)</long_description> <long_description>UAE is an Amiga emulator written by Bernd Schmidt et al, see http://amigaemulator.org. The port to Wii was done by Simon Kagstrom, with help from Christopher Follett, "Knitax" and Fabio Olimpieri (Oibaf)</long_description>
</app> </app>

View File

@ -90,7 +90,7 @@ static int loadsample (const char *path, struct drvsample *ds)
write_log ("driveclick: can't open '%s'\n", path); write_log ("driveclick: can't open '%s'\n", path);
return 0; return 0;
} }
// ("driveclick: loading '%s'\n", path); // write_log("driveclick: loading '%s'\n", path);
zfile_fseek (f, 0, SEEK_END); zfile_fseek (f, 0, SEEK_END);
size = zfile_ftell (f); size = zfile_ftell (f);
buf = malloc (size); buf = malloc (size);
@ -223,7 +223,7 @@ void driveclick_init (void)
} }
drvs[i][DS_CLICK].pos = drvs[i][DS_CLICK].len; drvs[i][DS_CLICK].pos = drvs[i][DS_CLICK].len;
drvs[i][DS_SNATCH].pos = drvs[i][DS_SNATCH].len; drvs[i][DS_SNATCH].pos = drvs[i][DS_SNATCH].len;
vv += currprefs.dfxclick[i]; vv += abs (currprefs.dfxclick[i]);
} }
} }

View File

@ -276,8 +276,9 @@ static const char **get_file_list(const char *base_dir)
de = readdir(d)) de = readdir(d))
{ {
char buf[255]; char buf[255];
const char *exts[] = {".adf", ".ADF", ".adz", ".ADZ", ".ipf", ".IPF", ".fdi", ".FDI", //ipf files are not enabled in UAE Wii
".sav", ".SAV", ".uss", ".USS", ".rom", ".ROM", ".zip",".ZIP",".dms", ".DMS",NULL}; const char *exts[] = {".adf", ".ADF", ".adz", ".ADZ", ".zip",".ZIP",".dms", ".DMS",
".sav", ".SAV", ".uss", ".USS", ".rom", ".ROM", NULL};
struct stat st; struct stat st;
snprintf(buf, 255, "%s/%s", base_dir, de->d_name); snprintf(buf, 255, "%s/%s", base_dir, de->d_name);

View File

@ -170,7 +170,7 @@ floppy1type=0
floppy2type=-1 floppy2type=-1
floppy3type=-1 floppy3type=-1
# Enable floppy sound # Enable floppy sound - set floppysound to -1 to load wave file - set to 0 to disable
floppy0sound=1 floppy0sound=1
floppy1sound=1 floppy1sound=1
floppy_volume=33 floppy_volume=33