From efcfba2ebf6058c404abcab7ae9d4942596bb845 Mon Sep 17 00:00:00 2001 From: "fabio.olimpieri" Date: Tue, 1 May 2012 13:48:29 +0000 Subject: [PATCH] First release --- Makefile | 6 ++++-- VERSIONS.wii | 5 +++++ icon.png | Bin 0 -> 9898 bytes meta.xml | 30 ++++++++++++++++++++++++++++++ src/emulator.c | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 VERSIONS.wii create mode 100644 icon.png create mode 100644 meta.xml diff --git a/Makefile b/Makefile index 6a884c8..ab66adb 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ INCLUDES := # options for code generation #--------------------------------------------------------------------------------- -CFLAGS = -g -O2 -Wall -Wno-unused-but-set-variable $(MACHDEP) $(INCLUDE) -Wno-pointer-sign -DDEBUG +CFLAGS = -g -O3 -Wall -Wno-unused-but-set-variable $(MACHDEP) $(INCLUDE) -Wno-pointer-sign CXXFLAGS = $(CFLAGS) LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map @@ -120,11 +120,13 @@ dist: $(BUILD) mkdir -p $@/fbzx-wii/scr mkdir -p $@/apps/fbzx-wii/doc cp fbzx.dol $@/apps/fbzx-wii/boot.dol + cp meta.xml $@/apps/fbzx-wii/meta.xml + cp icon.png $@/apps/fbzx-wii/icon.png cp spectrum-roms/* $@/fbzx-wii/spectrum-roms cp keymap.bmp $@/fbzx-wii/fbzx cp ZXSpectrum48k.png $@/fbzx-wii/fbzx cp FreeMono.ttf $@/fbzx-wii/fbzx - cp AMSTRAD CAPABILITIES COPYING FAQ README README.TZX VERSIONS $@/apps/fbzx-wii/doc + cp AMSTRAD CAPABILITIES COPYING FAQ README README.TZX VERSIONS VERSIONS.wii $@/apps/fbzx-wii/doc touch $@/fbzx-wii/tapes/dummy touch $@/fbzx-wii/snapshots/dummy touch $@/fbzx-wii/microdrives/dummy diff --git a/VERSIONS.wii b/VERSIONS.wii new file mode 100644 index 0000000..4cb9671 --- /dev/null +++ b/VERSIONS.wii @@ -0,0 +1,5 @@ + +version 1: + * Initial release + + -- Fabio Olimpieri May 1 2012 diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b10f41223d55be40aa8d8556529778b89012cb56 GIT binary patch literal 9898 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 c`EUOGe|_m;Q#;t literal 0 HcmV?d00001 diff --git a/meta.xml b/meta.xml new file mode 100644 index 0000000..92223e2 --- /dev/null +++ b/meta.xml @@ -0,0 +1,30 @@ + + + FBZX Wii + Oibaf + 1.0 + 20120501 + ZX Spectrum Emulator + A ZX Spectrum emulator for FrameBuffer written by Sergio Costas, see http://www.rastersoft.com/fbzx.html. +The port to Wii was done by Fabio Olimpieri. + +USAGE +------ +Put .z80 and .sna files in /fbzx-wii/snapshots or .tap and .tzx files in /fbzx-wii/tapes on your SD card. + +Press the home button to access the in-game menu. Press 1 to select an item and 2 to escape. + +Press the "+" button to access the virtual keyboard. + +The in-game menu allows you to insert tapes, load them and configure the display, joysticks etc. + +Snapshots and scr files will be stored on the SD card. + +The preferences are saved (joystick type, machine, etc.) from the main in-game menu and they are loaded on start-up. + +If rumble is enabled, the wiimote rumbles each time the fire button is pressed. + +See http://wiibrew.org/wiki/fbzx-wii for more information. + + + diff --git a/src/emulator.c b/src/emulator.c index c91a71d..497660a 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -550,7 +550,7 @@ int main(int argc,char *argv[]) { argumento=0; jump_frames=0; curr_frames=0; - ordenador.dblscan=0; + ordenador.dblscan=1; ordenador.bw=0; #ifdef DEBUG