diff --git a/Makefile.wii b/Makefile.wii
index 223235f..cee168a 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -39,9 +39,7 @@ LDFLAGS		= -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with
 #---------------------------------------------------------------------------------
-LIBS	:=	-lSDL_ttf -lSDL_gfx -lSDL_mixer -lSDL_image -ljpeg -lpng -lz -lSDL -lfreetype \
-			-ldb -ldi -lpngu -lmxml -lmetaphrasis \
-			-lfat -lwiiuse -lz -lbte -logc -lasnd -ltremor -lfreetype -ltinysmb
+LIBS	:=	-lSDL -lfat -lwiiuse -lbte -logc 
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
diff --git a/dosbox-wii.pnproj b/dosbox-wii.pnproj
index 25cb82a..dacec55 100644
--- a/dosbox-wii.pnproj
+++ b/dosbox-wii.pnproj
@@ -1 +1 @@
-<Project name="dosbox-wii"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cpu" path="cpu\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dynrec" path="core_dynrec\"><File path="cache.h"></File><File path="decoder.h"></File><File path="decoder_basic.h"></File><File path="decoder_opcodes.h"></File><File path="dyn_fpu.h"></File><File path="Makefile.am"></File><File path="operators.h"></File><File path="risc_armv4le-common.h"></File><File path="risc_armv4le-o3.h"></File><File path="risc_armv4le-s3.h"></File><File path="risc_armv4le-thumb-iw.h"></File><File path="risc_armv4le-thumb-niw.h"></File><File path="risc_armv4le-thumb.h"></File><File path="risc_armv4le.h"></File><File path="risc_mipsel32.h"></File><File path="risc_x64.h"></File><File path="risc_x86.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dyn_x86" path="core_dyn_x86\"><File path="cache.h"></File><File path="decoder.h"></File><File path="dyn_fpu.h"></File><File path="dyn_fpu_dh.h"></File><File path="helpers.h"></File><File path="Makefile.am"></File><File path="risc_x86.h"></File><File path="string.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_full" path="core_full\"><File path="ea_lookup.h"></File><File path="load.h"></File><File path="loadwrite.h"></File><File path="Makefile.am"></File><File path="op.h"></File><File path="optable.h"></File><File path="save.h"></File><File path="string.h"></File><File path="support.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_normal" path="core_normal\"><File path="helpers.h"></File><File path="Makefile.am"></File><File path="prefix_0f.h"></File><File path="prefix_66.h"></File><File path="prefix_66_0f.h"></File><File path="prefix_none.h"></File><File path="string.h"></File><File path="support.h"></File><File path="table_ea.h"></File></MagicFolder><File path="callback.cpp"></File><File path="core_dynrec.cpp"></File><File path="core_dyn_x86.cpp"></File><File path="core_full.cpp"></File><File path="core_normal.cpp"></File><File path="core_prefetch.cpp"></File><File path="core_simple.cpp"></File><File path="cpu.cpp"></File><File path="flags.cpp"></File><File path="instructions.h"></File><File path="lazyflags.h"></File><File path="Makefile.am"></File><File path="modrm.cpp"></File><File path="modrm.h"></File><File path="paging.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="debug" path="debug\"><File path="debug.cpp"></File><File path="debug_disasm.cpp"></File><File path="debug_gui.cpp"></File><File path="debug_inc.h"></File><File path="debug_win32.cpp"></File><File path="disasm_tables.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="dos" path="dos\"><File path="cdrom.cpp"></File><File path="cdrom.h"></File><File path="cdrom_aspi_win32.cpp"></File><File path="cdrom_image.cpp"></File><File path="cdrom_ioctl_linux.cpp"></File><File path="cdrom_ioctl_os2.cpp"></File><File path="cdrom_ioctl_win32.cpp"></File><File path="dev_con.h"></File><File path="dos.cpp"></File><File path="dos_classes.cpp"></File><File path="dos_codepages.h"></File><File path="dos_devices.cpp"></File><File path="dos_execute.cpp"></File><File path="dos_files.cpp"></File><File path="dos_ioctl.cpp"></File><File path="dos_keyboard_layout.cpp"></File><File path="dos_keyboard_layout_data.h"></File><File path="dos_memory.cpp"></File><File path="dos_misc.cpp"></File><File path="dos_mscdex.cpp"></File><File path="dos_programs.cpp"></File><File path="dos_tables.cpp"></File><File path="drives.cpp"></File><File path="drives.h"></File><File path="drive_cache.cpp"></File><File path="drive_fat.cpp"></File><File path="drive_iso.cpp"></File><File path="drive_local.cpp"></File><File path="drive_virtual.cpp"></File><File path="Makefile.am"></File><File path="scsidefs.h"></File><File path="wnaspi32.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fpu" path="fpu\"><File path="fpu.cpp"></File><File path="fpu_instructions.h"></File><File path="fpu_instructions_x86.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui" path="gui\"><File path="dosbox_logo.h"></File><File path="Makefile.am"></File><File path="midi.cpp"></File><File path="midi_alsa.h"></File><File path="midi_coreaudio.h"></File><File path="midi_coremidi.h"></File><File path="midi_oss.h"></File><File path="midi_win32.h"></File><File path="render.cpp"></File><File path="render_loops.h"></File><File path="render_scalers.cpp"></File><File path="render_scalers.h"></File><File path="render_simple.h"></File><File path="render_templates.h"></File><File path="render_templates_hq.h"></File><File path="render_templates_hq2x.h"></File><File path="render_templates_hq3x.h"></File><File path="render_templates_sai.h"></File><File path="sdlmain.cpp"></File><File path="sdl_gui.cpp"></File><File path="sdl_mapper.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="hardware" path="hardware\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="serialport" path="serialport\"><File path="directserial_os2.cpp"></File><File path="directserial_os2.h"></File><File path="directserial_posix.cpp"></File><File path="directserial_posix.h"></File><File path="directserial_win32.cpp"></File><File path="directserial_win32.h"></File><File path="Makefile.am"></File><File path="misc_util.cpp"></File><File path="misc_util.h"></File><File path="nullmodem.cpp"></File><File path="nullmodem.h"></File><File path="serialdummy.cpp"></File><File path="serialdummy.h"></File><File path="serialport.cpp"></File><File path="softmodem.cpp"></File><File path="softmodem.h"></File></MagicFolder><File path="adlib.cpp"></File><File path="adlib.h"></File><File path="cmos.cpp"></File><File path="dbopl.cpp"></File><File path="dbopl.h"></File><File path="disney.cpp"></File><File path="dma.cpp"></File><File path="fmopl.c"></File><File path="fmopl.h"></File><File path="gameblaster.cpp"></File><File path="gus.cpp"></File><File path="hardware.cpp"></File><File path="iohandler.cpp"></File><File path="ipx.cpp"></File><File path="ipxserver.cpp"></File><File path="joystick.cpp"></File><File path="keyboard.cpp"></File><File path="Makefile.am"></File><File path="memory.cpp"></File><File path="mixer.cpp"></File><File path="mpu401.cpp"></File><File path="opl.cpp"></File><File path="opl.h"></File><File path="pcspeaker.cpp"></File><File path="pic.cpp"></File><File path="sblaster.cpp"></File><File path="tandy_sound.cpp"></File><File path="timer.cpp"></File><File path="vga.cpp"></File><File path="vga_attr.cpp"></File><File path="vga_crtc.cpp"></File><File path="vga_dac.cpp"></File><File path="vga_draw.cpp"></File><File path="vga_gfx.cpp"></File><File path="vga_memory.cpp"></File><File path="vga_misc.cpp"></File><File path="vga_other.cpp"></File><File path="vga_paradise.cpp"></File><File path="vga_s3.cpp"></File><File path="vga_seq.cpp"></File><File path="vga_tseng.cpp"></File><File path="vga_xga.cpp"></File><File path="ymf262.c"></File><File path="ymf262.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ints" path="ints\"><File path="bios.cpp"></File><File path="bios_disk.cpp"></File><File path="bios_keyboard.cpp"></File><File path="ems.cpp"></File><File path="int10.cpp"></File><File path="int10.h"></File><File path="int10_char.cpp"></File><File path="int10_memory.cpp"></File><File path="int10_misc.cpp"></File><File path="int10_modes.cpp"></File><File path="int10_pal.cpp"></File><File path="int10_put_pixel.cpp"></File><File path="int10_vesa.cpp"></File><File path="int10_video_state.cpp"></File><File path="int10_vptable.cpp"></File><File path="Makefile.am"></File><File path="mouse.cpp"></File><File path="xms.cpp"></File><File path="xms.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui_tk" path="gui_tk\"><File path="Doxyfile"></File><File path="gui_tk.cpp"></File><File path="gui_tk.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="zmbv" path="zmbv\"><File path="drvproc.cpp"></File><File path="Makefile.am"></File><File path="resource.h"></File><File path="zmbv.cpp"></File><File path="zmbv.def"></File><File path="zmbv.h"></File><File path="zmbv.inf"></File><File path="zmbv.sln"></File><File path="zmbv.vcproj"></File><File path="zmbv_vfw.cpp"></File><File path="zmbv_vfw.h"></File><File path="zmbv_vfw.rc"></File></MagicFolder><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="misc" path="misc\"><File path="cross.cpp"></File><File path="Makefile.am"></File><File path="messages.cpp"></File><File path="programs.cpp"></File><File path="setup.cpp"></File><File path="support.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="platform" path="platform\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="visualc" path="visualc\"><File path="config.h"></File><File path="dirent.c"></File><File path="dirent.h"></File><File path="Makefile.am"></File><File path="ntddcdrm.h"></File><File path="ntddscsi.h"></File><File path="unistd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wii" path="wii\"><File path="config.h"></File></MagicFolder><File path="Makefile.am"></File><File path="sdl-win32.diff"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="shell" path="shell\"><File path="Makefile.am"></File><File path="shell.cpp"></File><File path="shell_batch.cpp"></File><File path="shell_cmds.cpp"></File><File path="shell_misc.cpp"></File></MagicFolder><File path="dosbox.cpp"></File><File path="Makefile.am"></File><File path="winres.rc"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="include" path="include\"><File path="bios.h"></File><File path="bios_disk.h"></File><File path="callback.h"></File><File path="control.h"></File><File path="cpu.h"></File><File path="cross.h"></File><File path="debug.h"></File><File path="dma.h"></File><File path="dosbox.h"></File><File path="dos_inc.h"></File><File path="dos_system.h"></File><File path="fpu.h"></File><File path="hardware.h"></File><File path="inout.h"></File><File path="ipx.h"></File><File path="ipxserver.h"></File><File path="joystick.h"></File><File path="keyboard.h"></File><File path="logging.h"></File><File path="Makefile.am"></File><File path="mapper.h"></File><File path="mem.h"></File><File path="mixer.h"></File><File path="modules.h"></File><File path="mouse.h"></File><File path="paging.h"></File><File path="pic.h"></File><File path="programs.h"></File><File path="regs.h"></File><File path="render.h"></File><File path="serialport.h"></File><File path="setup.h"></File><File path="shell.h"></File><File path="support.h"></File><File path="timer.h"></File><File path="vga.h"></File><File path="video.h"></File></MagicFolder><File path="README"></File><File path="VERSION"></File><File path="ChangeLog"></File><File path="NEWS"></File><File path="INSTALL"></File><File path="AUTHORS"></File><File path="THANKS"></File><File path="COPYING"></File><File path="Makefile.gc"></File><File path="Makefile.wii"></File><File path="Makefile"></File></Project>
\ No newline at end of file
+<Project name="dosbox-wii"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cpu" path="cpu\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dynrec" path="core_dynrec\"><File path="cache.h"></File><File path="decoder.h"></File><File path="decoder_basic.h"></File><File path="decoder_opcodes.h"></File><File path="dyn_fpu.h"></File><File path="Makefile.am"></File><File path="operators.h"></File><File path="risc_armv4le-common.h"></File><File path="risc_armv4le-o3.h"></File><File path="risc_armv4le-s3.h"></File><File path="risc_armv4le-thumb-iw.h"></File><File path="risc_armv4le-thumb-niw.h"></File><File path="risc_armv4le-thumb.h"></File><File path="risc_armv4le.h"></File><File path="risc_mipsel32.h"></File><File path="risc_x64.h"></File><File path="risc_x86.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dyn_x86" path="core_dyn_x86\"><File path="cache.h"></File><File path="decoder.h"></File><File path="dyn_fpu.h"></File><File path="dyn_fpu_dh.h"></File><File path="helpers.h"></File><File path="Makefile.am"></File><File path="risc_x86.h"></File><File path="string.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_full" path="core_full\"><File path="ea_lookup.h"></File><File path="load.h"></File><File path="loadwrite.h"></File><File path="Makefile.am"></File><File path="op.h"></File><File path="optable.h"></File><File path="save.h"></File><File path="string.h"></File><File path="support.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_normal" path="core_normal\"><File path="helpers.h"></File><File path="Makefile.am"></File><File path="prefix_0f.h"></File><File path="prefix_66.h"></File><File path="prefix_66_0f.h"></File><File path="prefix_none.h"></File><File path="string.h"></File><File path="support.h"></File><File path="table_ea.h"></File></MagicFolder><File path="callback.cpp"></File><File path="core_dynrec.cpp"></File><File path="core_dyn_x86.cpp"></File><File path="core_full.cpp"></File><File path="core_normal.cpp"></File><File path="core_prefetch.cpp"></File><File path="core_simple.cpp"></File><File path="cpu.cpp"></File><File path="flags.cpp"></File><File path="instructions.h"></File><File path="lazyflags.h"></File><File path="Makefile.am"></File><File path="modrm.cpp"></File><File path="modrm.h"></File><File path="paging.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="debug" path="debug\"><File path="debug.cpp"></File><File path="debug_disasm.cpp"></File><File path="debug_gui.cpp"></File><File path="debug_inc.h"></File><File path="debug_win32.cpp"></File><File path="disasm_tables.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="dos" path="dos\"><File path="cdrom.cpp"></File><File path="cdrom.h"></File><File path="cdrom_aspi_win32.cpp"></File><File path="cdrom_image.cpp"></File><File path="cdrom_ioctl_linux.cpp"></File><File path="cdrom_ioctl_os2.cpp"></File><File path="cdrom_ioctl_win32.cpp"></File><File path="dev_con.h"></File><File path="dos.cpp"></File><File path="dos_classes.cpp"></File><File path="dos_codepages.h"></File><File path="dos_devices.cpp"></File><File path="dos_execute.cpp"></File><File path="dos_files.cpp"></File><File path="dos_ioctl.cpp"></File><File path="dos_keyboard_layout.cpp"></File><File path="dos_keyboard_layout_data.h"></File><File path="dos_memory.cpp"></File><File path="dos_misc.cpp"></File><File path="dos_mscdex.cpp"></File><File path="dos_programs.cpp"></File><File path="dos_tables.cpp"></File><File path="drives.cpp"></File><File path="drives.h"></File><File path="drive_cache.cpp"></File><File path="drive_fat.cpp"></File><File path="drive_iso.cpp"></File><File path="drive_local.cpp"></File><File path="drive_virtual.cpp"></File><File path="Makefile.am"></File><File path="scsidefs.h"></File><File path="wnaspi32.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fpu" path="fpu\"><File path="fpu.cpp"></File><File path="fpu_instructions.h"></File><File path="fpu_instructions_x86.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui" path="gui\"><File path="dosbox_logo.h"></File><File path="Makefile.am"></File><File path="midi.cpp"></File><File path="midi_alsa.h"></File><File path="midi_coreaudio.h"></File><File path="midi_coremidi.h"></File><File path="midi_oss.h"></File><File path="midi_win32.h"></File><File path="render.cpp"></File><File path="render_loops.h"></File><File path="render_scalers.cpp"></File><File path="render_scalers.h"></File><File path="render_simple.h"></File><File path="render_templates.h"></File><File path="render_templates_hq.h"></File><File path="render_templates_hq2x.h"></File><File path="render_templates_hq3x.h"></File><File path="render_templates_sai.h"></File><File path="sdlmain.cpp"></File><File path="sdl_gui.cpp"></File><File path="sdl_mapper.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="hardware" path="hardware\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="serialport" path="serialport\"><File path="directserial_os2.cpp"></File><File path="directserial_os2.h"></File><File path="directserial_posix.cpp"></File><File path="directserial_posix.h"></File><File path="directserial_win32.cpp"></File><File path="directserial_win32.h"></File><File path="Makefile.am"></File><File path="misc_util.cpp"></File><File path="misc_util.h"></File><File path="nullmodem.cpp"></File><File path="nullmodem.h"></File><File path="serialdummy.cpp"></File><File path="serialdummy.h"></File><File path="serialport.cpp"></File><File path="softmodem.cpp"></File><File path="softmodem.h"></File></MagicFolder><File path="adlib.cpp"></File><File path="adlib.h"></File><File path="cmos.cpp"></File><File path="dbopl.cpp"></File><File path="dbopl.h"></File><File path="disney.cpp"></File><File path="dma.cpp"></File><File path="fmopl.c"></File><File path="fmopl.h"></File><File path="gameblaster.cpp"></File><File path="gus.cpp"></File><File path="hardware.cpp"></File><File path="iohandler.cpp"></File><File path="ipx.cpp"></File><File path="ipxserver.cpp"></File><File path="joystick.cpp"></File><File path="keyboard.cpp"></File><File path="Makefile.am"></File><File path="memory.cpp"></File><File path="mixer.cpp"></File><File path="mpu401.cpp"></File><File path="opl.cpp"></File><File path="opl.h"></File><File path="pcspeaker.cpp"></File><File path="pic.cpp"></File><File path="sblaster.cpp"></File><File path="tandy_sound.cpp"></File><File path="timer.cpp"></File><File path="vga.cpp"></File><File path="vga_attr.cpp"></File><File path="vga_crtc.cpp"></File><File path="vga_dac.cpp"></File><File path="vga_draw.cpp"></File><File path="vga_gfx.cpp"></File><File path="vga_memory.cpp"></File><File path="vga_misc.cpp"></File><File path="vga_other.cpp"></File><File path="vga_paradise.cpp"></File><File path="vga_s3.cpp"></File><File path="vga_seq.cpp"></File><File path="vga_tseng.cpp"></File><File path="vga_xga.cpp"></File><File path="ymf262.c"></File><File path="ymf262.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ints" path="ints\"><File path="bios.cpp"></File><File path="bios_disk.cpp"></File><File path="bios_keyboard.cpp"></File><File path="ems.cpp"></File><File path="int10.cpp"></File><File path="int10.h"></File><File path="int10_char.cpp"></File><File path="int10_memory.cpp"></File><File path="int10_misc.cpp"></File><File path="int10_modes.cpp"></File><File path="int10_pal.cpp"></File><File path="int10_put_pixel.cpp"></File><File path="int10_vesa.cpp"></File><File path="int10_video_state.cpp"></File><File path="int10_vptable.cpp"></File><File path="Makefile.am"></File><File path="mouse.cpp"></File><File path="xms.cpp"></File><File path="xms.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui_tk" path="gui_tk\"><File path="Doxyfile"></File><File path="gui_tk.cpp"></File><File path="gui_tk.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="zmbv" path="zmbv\"><File path="drvproc.cpp"></File><File path="Makefile.am"></File><File path="resource.h"></File><File path="zmbv.cpp"></File><File path="zmbv.def"></File><File path="zmbv.h"></File><File path="zmbv.inf"></File><File path="zmbv.sln"></File><File path="zmbv.vcproj"></File><File path="zmbv_vfw.cpp"></File><File path="zmbv_vfw.h"></File><File path="zmbv_vfw.rc"></File></MagicFolder><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="misc" path="misc\"><File path="cross.cpp"></File><File path="Makefile.am"></File><File path="messages.cpp"></File><File path="programs.cpp"></File><File path="setup.cpp"></File><File path="support.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="platform" path="platform\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="visualc" path="visualc\"><File path="config.h"></File><File path="dirent.c"></File><File path="dirent.h"></File><File path="Makefile.am"></File><File path="ntddcdrm.h"></File><File path="ntddscsi.h"></File><File path="unistd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wii" path="wii\"><File path="config.h"></File><File path="missingfunctions.cpp"></File></MagicFolder><File path="Makefile.am"></File><File path="sdl-win32.diff"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="shell" path="shell\"><File path="Makefile.am"></File><File path="shell.cpp"></File><File path="shell_batch.cpp"></File><File path="shell_cmds.cpp"></File><File path="shell_misc.cpp"></File></MagicFolder><File path="dosbox.cpp"></File><File path="Makefile.am"></File><File path="winres.rc"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="include" path="include\"><File path="bios.h"></File><File path="bios_disk.h"></File><File path="callback.h"></File><File path="control.h"></File><File path="cpu.h"></File><File path="cross.h"></File><File path="debug.h"></File><File path="dma.h"></File><File path="dosbox.h"></File><File path="dos_inc.h"></File><File path="dos_system.h"></File><File path="fpu.h"></File><File path="hardware.h"></File><File path="inout.h"></File><File path="ipx.h"></File><File path="ipxserver.h"></File><File path="joystick.h"></File><File path="keyboard.h"></File><File path="logging.h"></File><File path="Makefile.am"></File><File path="mapper.h"></File><File path="mem.h"></File><File path="mixer.h"></File><File path="modules.h"></File><File path="mouse.h"></File><File path="paging.h"></File><File path="pic.h"></File><File path="programs.h"></File><File path="regs.h"></File><File path="render.h"></File><File path="serialport.h"></File><File path="setup.h"></File><File path="shell.h"></File><File path="support.h"></File><File path="timer.h"></File><File path="vga.h"></File><File path="video.h"></File></MagicFolder><File path="README"></File><File path="VERSION"></File><File path="ChangeLog"></File><File path="NEWS"></File><File path="INSTALL"></File><File path="AUTHORS"></File><File path="THANKS"></File><File path="COPYING"></File><File path="Makefile.gc"></File><File path="Makefile.wii"></File><File path="Makefile"></File></Project>
\ No newline at end of file
diff --git a/include/paging.h b/include/paging.h
index f6fb81e..8a4346d 100644
--- a/include/paging.h
+++ b/include/paging.h
@@ -30,7 +30,9 @@
 
 // disable this to reduce the size of the TLB
 // NOTE: does not work with the dynamic core (dynrec is fine)
+#ifndef HW_RVL
 #define USE_FULL_TLB
+#endif
 
 class PageDirectory;
 
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 5d1bdc7..e93877e 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -32,6 +32,9 @@
 #include <signal.h>
 #include <process.h>
 #endif
+#ifdef HW_RVL
+#include <wiiuse/WPAD.h> 
+#endif
 
 #include "SDL.h"
 
@@ -1598,7 +1601,9 @@ int main(int argc, char* argv[]) {
 	if(!parsed_anyconfigfile) {
 		//Try to create the userlevel configfile.
 		config_file.clear();
+#ifndef HW_RVL
 		Cross::CreatePlatformConfigDir(config_path);
+#endif
 		Cross::GetPlatformConfigName(config_file);
 		config_path += config_file;
 		if(control->PrintConfig(config_path.c_str())) {
diff --git a/src/platform/wii/config.h b/src/platform/wii/config.h
index 240a12b..d68f7b6 100644
--- a/src/platform/wii/config.h
+++ b/src/platform/wii/config.h
@@ -19,8 +19,7 @@
 #define C_HEAVY_DEBUG 0
 
 /* The type of cpu this host has */
-//#define C_TARGETCPU X86
-//#define C_TARGETCPU X86_64
+#define C_TARGETCPU POWERPC
 
 /* Define to 1 to use x86 dynamic cpu core */
 #define C_DYNAMIC_X86 0
@@ -58,10 +57,6 @@
 #define INLINE inline
 //#define DB_FASTCALL __fastcall
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400) 
-#pragma warning(disable : 4996) 
-#endif
-
 typedef         double		Real64;
 /* The internal types */
 typedef  unsigned char		Bit8u;
@@ -69,7 +64,7 @@ typedef    signed char		Bit8s;
 typedef unsigned short		Bit16u;
 typedef   signed short		Bit16s;
 typedef  unsigned long		Bit32u;
-typedef    signed long		Bit32s;
+typedef    int				Bit32s;
 typedef unsigned long long	Bit64u;
 typedef   signed long long	Bit64s;
 typedef unsigned int		Bitu;
diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp
index 10a8210..ba2ff7a 100644
--- a/src/shell/shell.cpp
+++ b/src/shell/shell.cpp
@@ -21,6 +21,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#ifdef HW_RVL
+#include <wiiuse/WPAD.h> 
+#endif
 #include "dosbox.h"
 #include "regs.h"
 #include "control.h"
@@ -628,8 +631,19 @@ void SHELL_Init() {
 	dos.dta(RealMake(psp_seg,0x80));
 	dos.psp(psp_seg);
 
-	
+
 	SHELL_ProgramStart(&first_shell);
+
+#ifdef HW_RVL
+	printf("Press A to continue to a crash, or Home to exit.\n");
+	while (1) {
+		WPAD_ScanPads();
+		u16 buttonsDown = WPAD_ButtonsDown(0);
+		if( buttonsDown & WPAD_BUTTON_A ) break;
+		if( buttonsDown & WPAD_BUTTON_HOME ) exit(0);
+  	}
+#endif
+
 	first_shell->Run();
 	delete first_shell;
 	first_shell = 0;//Make clear that it shouldn't be used anymore