Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[801] vendor/fuse-emulator/current
|
From: <fr...@us...> - 2016-05-24 14:56:53
|
Revision: 801
http://sourceforge.net/p/fuse-for-macosx/code/801
Author: fredm
Date: 2016-05-24 14:56:49 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/INSTALL
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/THANKS
vendor/fuse-emulator/current/fuse/autogen.sh
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/compat/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/Makefile.am
vendor/fuse-emulator/current/fuse/data/fuse.desktop.in
vendor/fuse-emulator/current/fuse/data/fuse.xml.in
vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/fuse.h
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/Makefile.am
vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
vendor/fuse-emulator/current/fuse/m4/pkg.m4
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/machines/tc2068.c
vendor/fuse-emulator/current/fuse/machines/tc2068.h
vendor/fuse-emulator/current/fuse/machines/ts2068.c
vendor/fuse-emulator/current/fuse/man/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/menu_data.pl
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.h
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if1.h
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_internals.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_socket.c
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
vendor/fuse-emulator/current/fuse/perl/Makefile.am
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/roms/se-0.rom
vendor/fuse-emulator/current/fuse/roms/se-1.rom
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/ui/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/browse.c
vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
vendor/fuse-emulator/current/fuse/ui/gtk/fileselector.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkmouse.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/memory.c
vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
vendor/fuse-emulator/current/fuse/ui/gtk/statusbar.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.h
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/browse.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/debugger.rc
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
vendor/fuse-emulator/current/fuse/ui/win32/options.pl
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.rc
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/Makefile.am
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80.h
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/fuse/z80/z80_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/autogen.sh
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/generate.pl.in
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/memory.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/pzx_read.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/sp.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/data/shell-completion/
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
vendor/fuse-emulator/current/fuse/data/shell-completion/diff_options.sh
vendor/fuse-emulator/current/fuse/data/win32/distribution.mk
vendor/fuse-emulator/current/fuse/hacking/code_beautifiers.txt
vendor/fuse-emulator/current/fuse/hacking/uncrustify.cfg
vendor/fuse-emulator/current/fuse/lib/tests/success.d80.bz2
vendor/fuse-emulator/current/fuse/m4/ax_create_stdint_h.m4
vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.c
vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.h
vendor/fuse-emulator/current/fuse/peripherals/usource.c
vendor/fuse-emulator/current/fuse/peripherals/usource.h
vendor/fuse-emulator/current/fuse/svg.c
vendor/fuse-emulator/current/fuse/svg.h
vendor/fuse-emulator/current/fuse/ui/uimedia.h
vendor/fuse-emulator/current/fuse/uimedia.c
vendor/fuse-emulator/current/libspectrum/m4/ax_create_stdint_h.m4
vendor/fuse-emulator/current/libspectrum/m4/pkg.m4
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/installer/
vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:56:49 UTC (rev 801)
@@ -11,7 +11,7 @@
* John Elliott: for lib765, which provided Fuse's original emulation of the
+3's FDC, and libdsk which provided support for more disk image formats:
- see http://www.seasip.demon.co.uk/Unix/LibDsk/
+ see http://www.seasip.info/Unix/LibDsk/index.html
* Darren Salt: the original versions of the code for +3 emulation,
SLT support, MITSHM support (for the Xlib UI), TZX raw data blocks,
@@ -41,8 +41,8 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie'
- code and the ao sound driver.
+* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
+ the 'movie' code and the ALSO and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
+$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,3 +1,172 @@
+2016-??-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 1.2.0 released.
+
+ * New features:
+ * Add Currah µSource emulation (Stuart Brady).
+ * Add Didaktik 80/40 emulation (Gergely Szasz).
+ * Capture BASIC video functions to SVG file (Stefano Bodrato).
+ * Support bash completion (Sergio Baldoví).
+
+ * Emulation core improvements:
+ * Allow continuing RZX recordings if there is a final snapshot in the
+ RZX (Sergio Baldoví).
+ * Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Migrate disk "index event" handling to the FDD layer and have the
+ FDC layer use it for their STATUS registers (Gergely Szasz).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Implement WD2797 emulation (Gergely Szasz).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier)
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Centralise the "Disk icon" update code to the FDD layer (Gergely
+ Szasz).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Fix disk image corruption after saving UDI files (Sergio Baldoví).
+ * Check ready status after loading a disk into floppy disk drive
+ (thanks, John Elliott) (Sergio Baldoví).
+ * Fix overlapped SEEK commands (Sergio Baldoví).
+ * Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
+ (Sergio Baldoví).
+
+ * Machine specific improvements:
+ * The Timex SCLD is contended in all of the home, Dock and Exrom banks
+ in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
+ Meunier).
+ * Clear all Opus RAM on hard reset (Stuart Brady).
+ * Ensure the ZX Printer does not require a hard reset to enable
+ (thanks, RMartins) (Fredrick Meunier).
+ * Fix timing of events when emulating Scorpion (Stuart Brady).
+ * Ensure we have successfully selected a Pentagon or a Timex machine
+ before inserting their media (Fredrick Meunier).
+ * Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
+ (Sergio Baldoví).
+ * Don't enable the Beta 128 interface when loading a snapshot on a
+ machine with Beta built-in (thanks, windale and BogDan Vatra)
+ (Fredrick Meunier).
+ * Lock port +3 1FFDh if paging is disabled (Brian Ruthven and Fredrick
+ Meunier).
+ * Spectranet: fix segfault in error handling when setting SO_REUSEADDR
+ (Stuart Brady).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (part of feature request #90) (thanks, windale)
+ (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+
+ * Debugger improvements:
+ * Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
+ * Add I and R register setting and getting to the debugger (Sergio
+ Baldoví).
+ * Show the status of the halted flag in the debugger (Stuart Brady).
+ * Fix time breakpoints later than a frame in the future (Sergio
+ Baldoví).
+ * Timex EXROM and Dock text was truncated in the debugger UI (thanks,
+ Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
+ * Don't trap on breakpoints whilst halted (Stuart Brady).
+ * Win32: relocate halted flag and set monospaced font (Sergio
+ Baldoví).
+ * Fix memory issues when removing a matched breakpoint (Tom Seddon).
+ * Signal the UI when the breakpoints list is changed (BogDan Vatra).
+ * Document IF token for conditional expressions in debugger section
+ (thanks, TK90XFan) (Sergio Baldoví).
+ * Fix documentation of address syntax used in debugger section
+ (Sergio Baldoví).
+ * Allow debugger to dereference memory locations (Philip Kendall).
+
+ * Miscellaneous improvements:
+ * Remove warnings in aosound (Rene Ladan).
+ * Fix save tape traps with SE ROM (Andrew Owen and Fredrick Meunier).
+ * Don't ignore the return code from setuid() (Sergio Baldoví).
+ * Fix condition used in --with-desktop-dir option (thanks, wiz)
+ (Sergio Baldoví).
+ * Fix uninitialised keyboard button settings in GTK UI (UB880D).
+ * Fix pause when minimising Fuse on Windows (Sergio Baldoví).
+ * Generic FDD UI handling cleanup (Alex Badea).
+ * Remove unused macros on disk peripherals (Sergio Baldoví).
+ * Fix bad prototypes for activate signal on GTK UI (Sergio Baldoví).
+ * Ensure exiting on GTK UI when there are active breakpoints (Sergio
+ Baldoví).
+ * Improve scrolling of disassembly list on Win32 UI (Sergio Baldoví).
+ * Make mousewheel scrolling on memory browser GTK+ 3.4 compatible and
+ keep the selected row (Sergio Baldoví).
+ * Ignore unused-but-set-variable warnings for option dialogs on Win32
+ UI (Sergio Baldoví).
+ * Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
+ * Fix desktop integration rules to cope with VPATH builds (Sergio
+ Baldoví).
+ * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
+ (Sergio Baldoví).
+ * Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
+ * Prefer GTK+ 3 to GTK+ 2 (Sergio Baldoví).
+ * Abort start if we can't drop root privileges (Fredrick Meunier).
+ * Use real GLib if and only if libspectrum does and make GTK+ UI
+ depend on real GLib (Stuart Brady).
+ * Split tape/Microdrive options into a new Media Options dialogue
+ (Stuart Brady).
+ * Fix memory leak in joystick UI (Sergio Baldoví).
+ * Don't show an error when rewinding an empty tape (Sergio Baldoví).
+ * GTK UI: clear out row mark in tape browser when selecting another
+ block (Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Split Select ROMs menu into Machines and Peripherals (Gergely
+ Szasz).
+ * Only try to load the fallback ROM if it is different to the standard
+ one (Fredrick Meunier).
+ * Use PATH_MAX instead of FILENAME_MAX as our standard compatibility
+ define (thanks, Brian Ruthven) (Fredrick Meunier).
+ * WidgetUI: Fix build on Solaris (thanks, Brian Ruthven) (Fredrick
+ Meunier).
+ * Fix C89 compilation (Adrien Destugues).
+ * Standardise the number of joystick buttons across UIs (UB880D).
+ * Add static to functions where appropriate (Stuart Brady).
+ * Track port attachment for each data bus line (Stuart Brady).
+ * Switch to using non-recursive makefile (thanks, Stuart Brady)
+ (Sergio Baldoví).
+ * Move Windows resources that are UI-independent to data/win32
+ (Sergio Baldoví).
+ * Fix segfault due to inconsistent SETUP_CHECK() and CHECK() ordering
+ (UB880D; thanks, Guesser).
+ * Rename 'Interface I' to 'Interface 1' (thanks, Stuart Brady) (Sergio
+ Baldoví).
+ * Win32: fix compilation with mingwrt 4.0+ (Kirben).
+ * Replace various deprecated GTK+ functions: gtk_widget_modify_font,
+ GtkStock, gtk_tree_view_set_rules_hint(),
+ deprecated gdk_cursor_new() (Sergio Baldoví).
+ * Remove obsolete gtk_window_set_wmclass (Sergio Baldoví).
+ * Update URLs in documentation (Sergio Baldoví).
+ * Win32 UI: fix compilation with MinGW-w64 toolchain (lordhoto).
+ * Fix the build of SDL UI on Windows (Sergio Baldoví).
+ * Use compat_file_exists() instead of stat() in read_config_file() and
+ utils_find_file_path() (BogDan Vatra).
+ * Fix fdd_strerror() reading past the end of the fdd_error array
+ (BogDan Vatra).
+ * Use tape traps if we are using a custom ROM if the instructions at
+ the entry points have been preserved (thanks, Alberto Garcia)
+ (Fredrick Meunier).
+ * GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
+ Crisis) (Sergio Baldoví).
+ * Don't show hidden files/directories in the file selector on Widget
+ UIs (Sergio Baldoví).
+ * Remember filename when saving a recently formatted disk (Sergio
+ Baldoví).
+ * GTK UI: Change the resizing method for GTK+ UI for better
+ compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
+ Baldoví).
+
2013-05-24 Philip Kendall <phi...@sh...>
* Fuse 1.1.1 released.
@@ -1119,4 +1288,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
+$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/INSTALL
===================================================================
--- vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:56:49 UTC (rev 801)
@@ -64,8 +64,7 @@
./configure --target=powerpc-gekko --host=powerpc-gekko \
--with-wii \
- --without-libxml2 --without-libiconv --without-gpm \
- --without-x --without-glib \
+ --without-libxml2 --without-libiconv --without-gpm --without-x \
CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \
LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
-Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
@@ -82,8 +81,8 @@
Building the Win32 version of Fuse
----------------------------------
-You'll need to have the MinGW <http://www.mingw.org> or MinGW-w64 toolchain
-<http://mingw-w64.sourceforge.net>, e.g., on Debian:
+You'll need to have the MinGW <http://www.mingw.org/> or Mingw-w64 toolchain
+<http://mingw-w64.org/>, e.g., on Debian:
`apt-get install mingw32 mingw32-binutils mingw32-runtime'
On Windows, besides the former toolchain, you'll need an environment that
@@ -91,21 +90,21 @@
Cygwin <http://cygwin.com>.
The next examples build libspectrum and Fuse without any external library for
-the sake of clarity, but all these libraries successfully compile with MingGW
+the sake of clarity, but all these libraries successfully compile with a MinGW
environment - in case of problems with compiling any of the libs please refer to
the lib's homepage for help.
1) On Linux, first have to compile libspectrum:
./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
- --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
+ --without-libgcrypt --without-bzip2 --with-fake-glib --prefix=`pwd`
make install
This should `install' into the source directory.
Then, compile Fuse:
-./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
+./configure --host=i586-mingw32msvc --prefix=`pwd` \
--with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
--without-libxml2 --without-zlib --without-png --without-x
make
@@ -119,28 +118,28 @@
2) On Windows, using MSYS + MinGW toolchain, first build libspectrum:
-./configure --without-glib --without-libaudiofile --without-libgcrypt \
+./configure --with-fake-glib --without-libaudiofile --without-libgcrypt \
--without-zlib --without-bzip2 --prefix=/usr/local
make install
Then, build Fuse:
-./configure --with-win32 --without-glib --without-libxml2 --without-zlib \
- --without-png --prefix=/usr/local
+./configure --with-win32 --without-libxml2 --without-zlib --without-png \
+ --prefix=/usr/local
make
-3) On Windows, using Cygwin + MinGW toolchain, first build libspectrum:
+3) On Windows, using Cygwin + Mingw-w64 toolchain, first build libspectrum:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --without-glib \
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --with-fake-glib \
--without-libaudiofile --without-libgcrypt --without-zlib \
- --without-bzip2 --prefix=/usr/local/i686-pc
+ --without-bzip2 --prefix=/usr/local/i686-w64-mingw32
make install
Then, build Fuse:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --with-win32 \
- --without-glib --without-libxml2 --without-zlib --without-png \
- --prefix=/usr/local/i686-pc
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --without-libxml2 \
+ --without-zlib --without-png --with-win32 \
+ --prefix=/usr/local/i686-w64-mingw32
make
Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
@@ -162,4 +161,4 @@
respectively. That will make a temporary subdirectory (fuse-VERSION-win32)
in the build directory and then will create a package.
-$Id: INSTALL 4763 2012-11-16 11:01:59Z fredm $
+$Id: INSTALL 5407 2016-04-25 21:59:53Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2009 Philip Kendall
+## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
+## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -21,45 +21,12 @@
##
## E-mail: phi...@sh...
-AUTOMAKE_OPTIONS = foreign
-
ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = fuse
-SUBDIRS = @COMPAT_SUBDIR@ \
- data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
+noinst_PROGRAMS =
-DIST_SUBDIRS = data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
-
fuse_SOURCES = display.c \
event.c \
fuse.c \
@@ -83,94 +50,49 @@
snapshot.c \
sound.c \
spectrum.c \
+ svg.c \
tape.c \
ui.c \
uidisplay.c \
+ uimedia.c \
utils.c
-if COMPAT_DIRNAME
-fuse_SOURCES += compat/dirname.c
-endif
+fuse_LDADD = \
+ $(PTHREAD_LIBS) \
+ $(LIBSPEC_LIBS) \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(PNG_LIBS) \
+ $(SDL_LIBS) \
+ $(X_LIBS) \
+ $(XML_LIBS)
-if COMPAT_GETOPT
-fuse_SOURCES += compat/getopt.c compat/getopt1.c
-endif
+fuse_DEPENDENCIES =
-if COMPAT_MKSTEMP
-fuse_SOURCES += compat/mkstemp.c
-endif
+EXTRA_fuse_SOURCES =
-if COMPAT_WIN32
-fuse_SOURCES += windres.rc
-endif
-
-EXTRA_fuse_SOURCES = windres.rc
-
-fuse_LDADD = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-@LIBSPEC_LIBS@ \
-@GLIB_LIBS@ \
-@PNG_LIBS@ \
-@SOUND_LIBS@ \
-@SDL_LIBS@ \
-@X_LIBS@ \
-@XML_LIBS@ \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
-fuse_DEPENDENCIES = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
BUILT_SOURCES = options.h settings.c settings.h
-windres.o: windres.rc winfuse.ico ui/win32/*.rc
- @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc @LIBSPEC_CFLAGS@ @CPPFLAGS@ windres.o
-
settings.c: settings.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
settings.h: settings-header.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
-if WIDGET
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@WIDGET@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@WIDGET@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-else
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@UI@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@UI@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-endif
+options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ $(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-AM_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
+AM_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBSPEC_CFLAGS) \
+ $(XML_CFLAGS) \
+ -DFUSEDATADIR="\"${pkgdatadir}\"" \
+ $(SDL_CFLAGS) \
+ $(PNG_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
+
noinst_HEADERS = bitmap.h \
compat.h \
display.h \
@@ -196,6 +118,7 @@
snapshot.h \
sound.h \
spectrum.h \
+ svg.h \
tape.h \
utils.h \
options.h \
@@ -208,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
m4/libxml.m4 \
@@ -215,115 +139,54 @@
m4/sdl.m4 \
menu_data.dat \
menu_data.pl \
+ settings.dat \
settings.pl \
- settings-header.pl \
- settings.dat \
- winfuse.ico
+ settings-header.pl
CLEANFILES = options.h \
settings.c \
settings.h
-include compat/Makefile.am
+DISTCLEANFILES =
-if COMPAT_WIN32
+pkgdata_DATA =
-package_win32=$(PACKAGE)-$(PACKAGE_VERSION)-win32
-top_win32dir=$(top_builddir)/$(package_win32)
-install-win32: all
- test -n "$(DESTDIR)" || { echo "ERROR: set DESTDIR path"; exit 1; }
- $(MKDIR_P) $(DESTDIR)/roms/ || exit 1
- $(MKDIR_P) $(DESTDIR)/lib/ || exit 1
- cp $(top_srcdir)/roms/*.rom $(DESTDIR)/roms
- cp $(top_srcdir)/roms/README.copyright $(DESTDIR)/roms
- cp $(top_srcdir)/lib/*.bmp $(DESTDIR)/lib
- cp $(top_srcdir)/lib/*.scr $(DESTDIR)/lib
- cp $(top_builddir)/lib/*.szx $(DESTDIR)/lib
-# Copy fuse executable (we should manually copy the required libraries)
- cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
- cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
-# Get text files
- for file in AUTHORS ChangeLog COPYING README; \
- do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
- done
-# Get manuals
- if test -n "$(MAN2HTML)"; then \
- $(MAN2HTML) -r $(top_srcdir)/man/fuse.1 | sed '1d' > $(DESTDIR)/fuse.html; \
- else \
- test -z "$(GROFF)" || $(GROFF) -Thtml -man $(top_srcdir)/man/fuse.1 > $(DESTDIR)/fuse.html; \
- fi
-# Convert to DOS line endings
- test -z "$(UNIX2DOS)" || find $(DESTDIR) -type f \( -name "*.txt" -or -name "*.html" -or -name "*.copyright" \) -exec $(UNIX2DOS) {} \;
+## Resources for Windows executables
+if COMPAT_WIN32
-install-win32-strip: install-win32
- test -z "$(STRIP)" || $(STRIP) $(DESTDIR)/fuse$(EXEEXT)
+fuse_SOURCES += windres.rc
+fuse_LDADD += windres.o
+fuse_DEPENDENCIES += windres.o
-dist-win32-dir:
- $(MAKE) DESTDIR="$(top_win32dir)" install-win32-strip
+windres.o: windres.rc data/win32/winfuse.ico data/win32/fuse.manifest $(ui_win32_res)
+ $(AM_V_GEN)$(WINDRES) -I$(srcdir) -I. $(srcdir)/windres.rc $(LIBSPEC_CFLAGS) $(CPPFLAGS) windres.o
-dist-win32-zip: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
- cd $(top_win32dir) && \
- zip -q -9 -r $(abs_top_builddir)/$(package_win32).zip .
- -sha1sum $(top_builddir)/$(package_win32).zip > $(top_builddir)/$(package_win32).zip.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).zip.sha1; }
+endif
-dist-win32-7z: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
- cd $(top_win32dir) && \
- 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -bd $(abs_top_builddir)/$(package_win32).7z .
- -sha1sum $(top_builddir)/$(package_win32).7z > $(top_builddir)/$(package_win32).7z.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).7z.sha1; }
-dist-win32-exe: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
-# Locate NSIS in system path, MSYS drive or Cygwin drive
- @NSISFILE="$(abs_top_builddir)/ui/win32/installer/fuse.nsi"; \
- if makensis -VERSION > /dev/null 2>&1; then \
- MAKENSIS="makensis"; \
- elif [ -x "/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/c/Program\ Files/NSIS/makensis"; \
- elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
- else \
- echo 'ERROR: cannot locate makensis tool'; exit 1; \
- fi; \
- case "`uname -s`" in \
- CYGWIN*) NSISFILE=`cygpath -m $$NSISFILE`;; \
- esac; \
- cd $(top_win32dir); \
- eval "$$MAKENSIS -V2 -NOCD $$NSISFILE"
- mv $(top_win32dir)/$(package_win32)-setup.exe $(top_builddir)
- -sha1sum $(top_builddir)/$(package_win32)-setup.exe > $(top_builddir)/$(package_win32)-setup.exe.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32)-setup.exe.sha1; }
-
-dist-win32: dist-win32-zip dist-win32-7z dist-win32-exe
-
-distclean-win32:
- if test -d "$(top_builddir)/$(package_win32)"; then \
- rm -rf -- "$(top_builddir)/$(package_win32)"; \
- fi
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
-
-.PHONY: install-win32 install-win32-strip dist-win32 dist-win32-dir \
- dist-win32-zip dist-win32-7z dist-win32-exe distclean-win32
-
-endif
+include compat/Makefile.am
+include data/Makefile.am
+include debugger/Makefile.am
+include hacking/Makefile.am
+include lib/Makefile.am
+include machines/Makefile.am
+include man/Makefile.am
+include peripherals/Makefile.am
+include perl/Makefile.am
+include pokefinder/Makefile.am
+include roms/Makefile.am
+include sound/Makefile.am
+include timer/Makefile.am
+include ui/Makefile.am
+include ui/fb/Makefile.am
+include ui/gtk/Makefile.am
+include ui/scaler/Makefile.am
+include ui/sdl/Makefile.am
+include ui/svga/Makefile.am
+include ui/widget/Makefile.am
+include ui/wii/Makefile.am
+include ui/win32/Makefile.am
+include ui/xlib/Makefile.am
+include unittests/Makefile.am
+include z80/Makefile.am
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/README 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.1
+The Free Unix Spectrum Emulator (Fuse) 1.2.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -25,7 +25,8 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+ interfaces.
Help! <xyz> doesn't work
------------------------
@@ -107,4 +108,4 @@
Philip Kendall <phi...@sh...>
24th May, 2013
-$Id: README 4995 2013-05-24 19:54:19Z zubzero $
+$Id: README 5403 2016-04-25 13:10:53Z fredm $
Modified: vendor/fuse-emulator/current/fuse/THANKS
===================================================================
--- vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:56:49 UTC (rev 801)
@@ -29,7 +29,7 @@
you've got an Amiga, you may well like to check out Ian's Spectrum
Emulator, ASp: http://www.lasernet.plus.com/asp.html
-* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/)
+* Shawn Hargreaves: for Allegro (http://liballeg.org/)
(again, used by previous versions of Fuse for the graphical display)
* Steven Harrison: for helping track down why the SDL sound routines
@@ -44,7 +44,7 @@
emulations (see `AUTHORS')
* Gerton Lunter: his wonderful z80
- (ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/pc/dos/z80-400.zip)
+ (http://www.worldofspectrum.org/pub/sinclair/emulators/pc/windows/z80-400.zip)
got me started on this emulation lark all those years ago...
* Anders Holmberg: for reporting a bug in the z80 v1.45 load routines. Anders
@@ -102,4 +102,4 @@
* Matan Ziv-Av: for various bits of code (see `AUTHORS')
-$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $
+$Id: THANKS 5357 2016-02-23 23:43:54Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/autogen.sh
===================================================================
--- vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:56:49 UTC (rev 801)
@@ -2,8 +2,9 @@
# autogen.sh: autotools invocation
# Copyright (c) 2004 Philip Kendall
+# Copyright (c) 2014 Sergio Baldoví
-# $Id: autogen.sh 4749 2012-10-15 11:22:31Z fredm $
+# $Id: autogen.sh 5434 2016-05-01 04:22:45Z fredm $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,7 +29,9 @@
aclocal -I m4
# Mac OS X: Use glibtoolize instead
-libtoolize --automake
+(glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize \
+ || LIBTOOLIZE=libtoolize
+$LIBTOOLIZE --automake
autoheader
automake --add-missing
autoconf
Modified: vendor/fuse-emulator/current/fuse/bitmap.h
===================================================================
--- vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,5 +1,5 @@
/* bitmap.h: Bitmap routines
- Copyright (c) 2007 Stuart Brady
+ Copyright (c) 2007-2015 Stuart Brady
$Id$
@@ -28,19 +28,19 @@
#ifndef FUSE_BITMAP_H
#define FUSE_BITMAP_H
-inline static void
+static inline void
bitmap_set( libspectrum_byte *b, const size_t n )
{
b[ n / 8 ] |= ( 1 << ( n % 8 ) );
}
-inline static void
+static inline void
bitmap_reset( libspectrum_byte *b, const size_t n )
{
b[ n / 8 ] &= ~( 1 << ( n % 8 ) );
}
-inline static int
+static inline int
bitmap_test( const libspectrum_byte *b, const size_t n )
{
return b[ n / 8 ] & ( 1 << ( n % 8 ) );
Modified: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,7 +1,8 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2003-2012 Philip Kendall
+## Copyright (c) 2003-2013 Philip Kendall
+## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 4738 2012-10-03 13:15:31Z fredm $
+## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -21,18 +22,93 @@
##
## E-mail: phi...@sh...
-AM_CPPFLAGS += -I$(srcdir)/compat
+noinst_HEADERS += compat/getopt.h
-DIST_SUBDIRS += compat/amiga \
- compat/linux \
- compat/morphos \
- compat/unix \
- compat/wii \
- compat/win32
+if COMPAT_DIRNAME
+fuse_SOURCES += compat/dirname.c
+endif
-EXTRA_fuse_SOURCES += compat/dirname.c \
- compat/getopt.c \
- compat/getopt1.c \
- compat/mkstemp.c
+if COMPAT_GETOPT
+fuse_SOURCES += compat/getopt.c compat/getopt1.c
+endif
-noinst_HEADERS += compat/getopt.h
+if COMPAT_MKSTEMP
+fuse_SOURCES += compat/mkstemp.c
+endif
+
+## Amiga routines
+if COMPAT_AMIGA
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/amiga/osname.c \
+ compat/amiga/paths.c \
+ compat/unix/timer.c
+endif
+
+## Linux routines
+if COMPAT_LINUX
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/unix/osname.c \
+ compat/linux/paths.c \
+ compat/unix/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/unix/socket.c
+endif
+endif
+
+## Morphos routines
+if COMPAT_MORPHOS
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/morphos/osname.c \
+ compat/amiga/paths.c \
+ compat/unix/timer.c
+endif
+
+## Unix routines
+if COMPAT_UNIX
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/unix/osname.c \
+ compat/unix/paths.c \
+ compat/unix/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/unix/socket.c
+endif
+endif
+
+## Wii routines
+if COMPAT_WII
+fuse_SOURCES += \
+ compat/wii/dir.c \
+ compat/unix/file.c \
+ compat/wii/osname.c \
+ compat/wii/paths.c \
+ compat/wii/timer.c
+endif
+
+## Windows routines
+if COMPAT_WIN32
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/win32/osname.c \
+ compat/win32/paths.c \
+ compat/win32/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/win32/socket.c
+endif
+endif
+
+## SpeccyBoot routines
+if HAVE_TUNTAP
+fuse_SOURCES += compat/unix/tuntap.c
+endif
Deleted: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,41 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2012 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- osname.c \
- paths.c \
- ../unix/timer.c
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
--DFUSEDATADIR="\"${pkgdatadir}\""
Deleted: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2012 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- ../unix/osname.c \
- paths.c \
- ../unix/timer.c
-
-if HAVE_SOCKETS
-libcompatos_a_SOURCES += ../unix/socket.c
-endif
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
--DFUSEDATADIR="\"${pkgdatadir}\""
Deleted: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,40 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2008 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- osname.c \
- ../amiga/paths.c \
- ../unix/timer.c
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Deleted: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2012 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = dir.c \
- file.c \
- osname.c \
- paths.c \
- timer.c
-
-if HAVE_SOCKETS
-libcompatos_a_SOURCES += socket.c
-endif
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
--DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,5 +1,5 @@
/* socket.c: Socket-related compatibility routines
- Copyright (c) 2011-2012 Philip Kendall
+ Copyright (c) 2011-2015 Philip Kendall
$Id$
@@ -75,11 +75,8 @@
int error;
int pipefd[2];
- compat_socket_selfpipe_t *self = malloc( sizeof( *self ) );
- if( !self ) {
- ui_error( UI_ERROR_ERROR, "%s: %d: out of memory", __FILE__, __LINE__ );
- fuse_abort();
- }
+ compat_socket_selfpipe_t *self =
+ libspectrum_new( compat_socket_selfpipe_t, 1 );
error = pipe( pipefd );
if( error ) {
@@ -97,7 +94,7 @@
{
close( self->read_fd );
close( self->write_fd );
- free( self );
+ libspectrum_free( self );
}
compat_socket_t compat_socket_selfpipe_get_read_fd( compat_socket_selfpipe...
[truncated message content] |
