Merge pull request #93 from libretro/revert-1.6.0-revert

Revert update-1.6.0 revert

Merge pull request #93 from libretro/revert-1.6.0-revert
Revert update-1.6.0 revert
21c8ffb4 · Libretro-Admin · GitHub · 25d8f170 · eb895a35 · 21c8ffb4
Unverified Commit 21c8ffb4 authored Apr 10, 2021 by Libretro-Admin Committed by GitHub Apr 10, 2021
--- a/build/Makefile.common
+++ b/build/Makefile.common
@@ -27,6 +27,12 @@ SOURCES_C += $(CORE_DIR)/src/compat/paths.c
 SOURCES_C += $(CORE_DIR)/src/compat/sound.c
 SOURCES_C += $(CORE_DIR)/src/compat/timer.c
 SOURCES_C += $(CORE_DIR)/src/compat/ui.c
+#SOURCES_C += $(CORE_DIR)/src/compat/socket.c
+
+#SOURCES_C += $(CORE_DIR)/src/fuse/getopt.c
+#SOURCES_C += $(CORE_DIR)/src/fuse/getopt1.c
+
+SOURCES_C += $(CORE_DIR)/fuse/infrastructure/startup_manager.c

 SOURCES_C += $(CORE_DIR)/fuse/debugger/breakpoint.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/command.c
@@ -37,6 +43,7 @@ SOURCES_C += $(CORE_DIR)/fuse/debugger/disassemble.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/event.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/expression.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/variable.c
+SOURCES_C += $(CORE_DIR)/fuse/debugger/system_variable.c

 SOURCES_C += $(CORE_DIR)/fuse/machines/machines_periph.c
 SOURCES_C += $(CORE_DIR)/fuse/machines/pentagon.c
@@ -65,6 +72,8 @@ SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/opus.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/plusd.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/upd_fdc.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/wd_fdc.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/didaktik.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/trdos.c

 SOURCES_C += $(CORE_DIR)/fuse/peripherals/flash/am29f010.c

@@ -73,8 +82,13 @@ SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/ide.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/simpleide.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/zxatasp.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/zxcf.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/divmmc.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/divxxx.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/zxmmc.c

 #SOURCES_C += $(CORE_DIR)/fuse/peripherals/nic/enc28j60.c
+#SOURCES_C += $(CORE_DIR)/fuse/peripherals/nic/w5100.c
+#SOURCES_C += $(CORE_DIR)/fuse/peripherals/nic/w5100_socket.c

 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ay.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/dck.c
@@ -90,6 +104,10 @@ SOURCES_C += $(CORE_DIR)/fuse/peripherals/speccyboot.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/specdrum.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/spectranet.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ula.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/multiface.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ttx2000s.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/usource.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/covox.c

 SOURCES_C += $(CORE_DIR)/fuse/pokefinder/pokefinder.c
 SOURCES_C += $(CORE_DIR)/fuse/pokefinder/pokemem.c
@@ -115,6 +133,8 @@ SOURCES_C += $(CORE_DIR)/fuse/ui/widget/roms.c
 SOURCES_C += $(CORE_DIR)/fuse/ui/widget/select.c
 SOURCES_C += $(CORE_DIR)/fuse/ui/widget/text.c
 SOURCES_C += $(CORE_DIR)/fuse/ui/widget/widget.c
+SOURCES_C += $(CORE_DIR)/fuse/ui/widget/about.c
+SOURCES_C += $(CORE_DIR)/fuse/ui/widget/binary.c

 SOURCES_C += $(CORE_DIR)/fuse/ui/scaler/scaler.c

@@ -122,6 +142,7 @@ SOURCES_C += $(CORE_DIR)/fuse/unittests/unittests.c

 SOURCES_C += $(CORE_DIR)/fuse/z80/z80.c
 SOURCES_C += $(CORE_DIR)/fuse/z80/z80_ops.c
+SOURCES_C += $(CORE_DIR)/fuse/z80/z80_debugger_variables.c

 SOURCES_C += $(CORE_DIR)/fuse/display.c
 SOURCES_C += $(CORE_DIR)/fuse/event.c
@@ -130,7 +151,7 @@ SOURCES_C += $(CORE_DIR)/fuse/input.c
 SOURCES_C += $(CORE_DIR)/fuse/keyboard.c
 SOURCES_C += $(CORE_DIR)/fuse/loader.c
 SOURCES_C += $(CORE_DIR)/fuse/machine.c
-SOURCES_C += $(CORE_DIR)/fuse/memory.c
+SOURCES_C += $(CORE_DIR)/fuse/memory_pages.c
 SOURCES_C += $(CORE_DIR)/fuse/mempool.c
 SOURCES_C += $(CORE_DIR)/fuse/menu.c
 SOURCES_C += $(CORE_DIR)/fuse/movie.c
@@ -150,7 +171,11 @@ SOURCES_C += $(CORE_DIR)/fuse/tape.c
 SOURCES_C += $(CORE_DIR)/src/fuse/ui.c
 SOURCES_C += $(CORE_DIR)/fuse/uidisplay.c
 SOURCES_C += $(CORE_DIR)/src/fuse/utils.c
+SOURCES_C += $(CORE_DIR)/fuse/phantom_typist.c
+SOURCES_C += $(CORE_DIR)/fuse/uimedia.c
+SOURCES_C += $(CORE_DIR)/fuse/svg.c

+SOURCES_C += $(CORE_DIR)/libspectrum/buffer.c
 SOURCES_C += $(CORE_DIR)/libspectrum/bzip2.c
 SOURCES_C += $(CORE_DIR)/libspectrum/creator.c
 SOURCES_C += $(CORE_DIR)/libspectrum/crypto.c
@@ -189,6 +214,8 @@ SOURCES_C += $(CORE_DIR)/libspectrum/z80.c
 SOURCES_C += $(CORE_DIR)/libspectrum/z80em.c
 SOURCES_C += $(CORE_DIR)/libspectrum/zlib.c
 SOURCES_C += $(CORE_DIR)/libspectrum/zxs.c
+SOURCES_C += $(CORE_DIR)/libspectrum/mmc.c
+SOURCES_C += $(CORE_DIR)/libspectrum/zip.c

 SOURCES_C += $(CORE_DIR)/zlib/adler32.c
 SOURCES_C += $(CORE_DIR)/zlib/compress.c

--- a/fuse/.gitignore
+++ b/fuse/.gitignore
+*~
+*.swp
+*.orig
+.DS_Store
+.vscode
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/cscope.out
+/data/fuse.desktop
+/data/fuse.xml
+/data/shell-completion/bash.txt
+/data/shell-completion/man.txt
+/data/shell-completion/settings.txt
+/data/win32/fuse.manifest
+/data/win32/installer.nsi
+/debugger/commandl.c
+/debugger/commandy.c
+/debugger/commandy.h
+/depcomp
+.deps
+.dirstamp
+/fuse
+/fuse.dSYM
+/fuse.exe
+/.gdb_history
+/install-sh
+.libs
+/lib/*.szx
+/lib/tests/fatware-success.hdf
+/lib/tests/idedos-success.hdf
+/lib/tests/success.d80
+/lib/tests/success.mgt
+/libtool
+/ltmain.sh
+/m4/libtool.m4
+/m4/lt~obsolete.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/Makefile
+/Makefile.in
+/missing
+/mkinstalldirs
+*.o
+/options.h
+/roms/128p-0.rom
+/roms/128p-1.rom
+/roms/256s-0.rom
+/roms/256s-1.rom
+/roms/256s-2.rom
+/roms/256s-3.rom
+/roms/didaktik80.rom
+/roms/gluck.rom
+/roms/if1-2.rom
+/roms/opus.rom
+/roms/trdos.rom
+/roms/usource.rom
+/settings.c
+/settings.h
+/stamp-h
+/stamp-h1
+/stamp-h.in
+tags
+/ui/fb/keysyms.c
+/ui/gtk/keysyms.c
+/ui/gtk/menu_data.c
+/ui/gtk/menu_data.ui
+/ui/gtk/options.c
+/ui/gtk/options.h
+/ui/gtk/options_internals.h
+/ui/null/options.c
+/ui/sdl/keysyms.c
+/ui/svga/keysyms.c
+/ui/widget/fuse.font
+/ui/widget/menu_data.c
+/ui/widget/options.c
+/ui/widget/options.h
+/ui/widget/options_internals.h
+/ui/wii/keysyms.c
+/ui/win32/keysyms.c
+/ui/win32/menu_data.c
+/ui/win32/menu_data.h
+/ui/win32/menu_data.rc
+/ui/win32/options.c
+/ui/win32/options_internals.h
+/ui/win32/options.rc
+/ui/xlib/keysyms.c
+/ui/xlib/xpixmaps.c
+/ylwrap
+/z80/coretest
+/z80/coretest.exe
+/z80/coretest.out
+/z80/opcodes_base.c
+/z80/tests.actual
+/z80/z80_cb.c
+/z80/z80_ddfd.c
+/z80/z80_ddfdcb.c
+/z80/z80_ed.c
--- a/fuse/AUTHORS
+++ b/fuse/AUTHORS
@@ -11,7 +11,7 @@ Fuse has been brought to you by:

 * 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,
@@ -32,7 +32,7 @@ Fuse has been brought to you by:
 * Matthew Wescott: the AY logging code.

 * Marek Januszewski: Some patches making Fuse much closer to compiling under
-  Win32, and fixing up the GTK+ 2.0 interface.
+  Win32, and fixing up the GTK 2.0 interface.

 * Sergio Baldoví: improvements to the Win32 UI.

@@ -41,8 +41,8 @@ Fuse has been brought to you by:

 * 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 ALSA and ao sound drivers.

 * Bjoern Giesler: the original Wii port.

@@ -53,5 +53,3 @@ Fuse has been brought to you by:
 * Patrik Persson: the SpeccyBoot Ethernet emulation.

 * Philip Kendall: everything else.
-
-$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
--- a/fuse/ChangeLog
+++ b/fuse/ChangeLog
--- a/fuse/INSTALL
+++ b/fuse/INSTALL
@@ -8,8 +8,8 @@ $ ./configure
 There are now some options you can give to configure; `configure
 --help' will list them all, but the most important are:

--with-fb		Use the framebuffer interface, rather than GTK+.
--with-sdl		Use the SDL interface, rather than GTK+.
+--with-fb		Use the framebuffer interface, rather than GTK.
+--with-sdl		Use the SDL interface, rather than GTK.
 --with-svgalib		Use the SVGAlib interface.
 --without-gtk		Use the plain Xlib interface.

@@ -39,7 +39,7 @@ do this bit.

 Once you've got Fuse configured and built, read the man page :-)

-Note that if you're using version of Fuse from Subversion rather than
+Note that if you're using version of Fuse from Git rather than
 one of the released tarballs, you'll need to run `autogen.sh' before
 running 'configure' for the first time.

@@ -64,8 +64,7 @@ Then, use this configure line:

 ./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,65 +81,66 @@ methods.
 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:
-`apt-get install mingw32 mingw32-binutils mingw32-runtime'
+You'll need to have the Mingw-w64 toolchain <http://mingw-w64.org/>, e.g., on
+Debian: `apt-get install mingw-w64'

 On Windows, besides the former toolchain, you'll need an environment that
-includes a collection of Unix tools, like MSYS <http://www.mingw.org> or
+includes a collection of Unix tools, like MSYS2 <https://msys2.github.io/> or
 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:
+1) On Linux, first build libspectrum:

-./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
-	    --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
+./configure --host=i686-w64-mingw32 --without-libaudiofile --without-zlib \
+            --without-libgcrypt --without-bzip2 --with-fake-glib --prefix=`pwd`
 make install

-This should `install' into the source directory.
+This should install libspectrum into the same source directory.

 Then, compile Fuse:

-./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
-	    --with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
-	    --without-libxml2 --without-zlib --without-png --without-x
+PKG_CONFIG_LIBDIR=`pwd`/../libspectrum/lib/pkgconfig \
+./configure --host=i686-w64-mingw32 --prefix=`pwd` --with-win32 \
+            --without-libxml2 --without-zlib --without-png --without-pthread
 make

-You have to use the real path of libspectrum with `--with-libspectrum-prefix='.
+You have to use the real path of libspectrum with `PKG_CONFIG_LIBDIR'.
 This should build `fuse.exe' without any external lib, but you can run it on
 Windows or Linux (with Wine).

-With wine you need `fltmgr.sys' in Windows `system32' directory. (e.g.:
-~/.wine/c_drive/windows/system32).
+You need libwinpthread-1.dll in the same directory as `fuse.exe', most
+likely it is located in /usr/i686-w64-mingw32/lib/

-2) On Windows, using MSYS + MinGW toolchain, first build libspectrum:
+2) On Windows, using MSYS2 + Mingw-w64 toolchain, first build libspectrum:

-./configure --without-glib --without-libaudiofile --without-libgcrypt \
-	    --without-zlib --without-bzip2 --prefix=/usr/local
+./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
+
+PKG_CONFIG_PATH=/usr/local/lib/pkgconfig \
+./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 \
-	    --without-libaudiofile --without-libgcrypt --without-zlib \
-	    --without-bzip2 --prefix=/usr/local/i686-pc
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --with-fake-glib \
+            --without-libaudiofile --without-libgcrypt --without-zlib \
+            --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
+PKG_CONFIG_LIBDIR=/usr/local/i686-w64-mingw32/lib/pkgconfig \
+./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'
@@ -161,5 +161,3 @@ Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
  Additional tools are required for the former rules: Info-Zip, p7zip and NSIS,
  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 $
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
 ## Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2009 Philip Kendall
-
-## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
+## Copyright (c) 1999-2015 Philip Kendall

 ## 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,44 +19,11 @@
 ##
 ## E-mail: philip-fuse@shadowmagic.org.uk

-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
-
-DIST_SUBDIRS = data \
-	       debugger \
-	       hacking \
-	       lib \
-	       machines \
-	       man \
-               peripherals \
-	       perl \
-	       pokefinder \
-	       roms \
-	       sound \
-	       timer \
-	       ui \
-	       unittests \
-	       z80
+noinst_PROGRAMS =

 fuse_SOURCES = display.c \
 	event.c \
@@ -67,12 +32,13 @@ fuse_SOURCES = display.c \
 	keyboard.c \
 	loader.c \
 	machine.c \
-	memory.c \
+	memory_pages.c \
 	mempool.c \
 	menu.c \
 	movie.c \
 	module.c \
 	periph.c \
+	phantom_typist.c \
 	profile.c \
 	psg.c \
 	rectangle.c \
@@ -83,93 +49,54 @@ fuse_SOURCES = display.c \
 	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
-
-if COMPAT_GETOPT
-fuse_SOURCES += compat/getopt.c compat/getopt1.c
-endif
-
-if COMPAT_MKSTEMP
-fuse_SOURCES += compat/mkstemp.c
+fuse_LDADD = \
+             $(PTHREAD_LIBS) \
+             $(LIBSPECTRUM_LIBS) \
+             $(GTK_LIBS) \
+             $(GLIB_LIBS) \
+             $(PNG_LIBS) \
+             $(X_LIBS) \
+             $(XML_LIBS)
+
+if USE_SDL
+fuse_LDADD += $(SDL_LIBS)
 endif

-if COMPAT_WIN32
-fuse_SOURCES += windres.rc
-endif
-
-EXTRA_fuse_SOURCES = windres.rc
+fuse_DEPENDENCIES =

-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@
+EXTRA_fuse_SOURCES =

 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 $@
+
+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 $@

-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 $@
+AM_CPPFLAGS = \
+              $(GLIB_CFLAGS) \
+              $(GTK_CFLAGS) \
+              $(LIBSPECTRUM_CFLAGS) \
+              $(XML_CFLAGS) \
+              -DFUSEDATADIR="\"${pkgdatadir}\"" \
+              $(PNG_CFLAGS)
+
+if USE_SDL
+AM_CPPFLAGS += $(SDL_CFLAGS)
 endif

-AM_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
+AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)

 noinst_HEADERS = bitmap.h \
 	compat.h \
@@ -180,13 +107,14 @@ noinst_HEADERS = bitmap.h \
 	keyboard.h \
 	loader.h \
 	machine.h \
-	memory.h \
+	memory_pages.h \
 	mempool.h \
 	menu.h \
 	movie.h \
 	movie_tables.h \
 	module.h \
 	periph.h \
+	phantom_typist.h \
 	psg.h \
 	rectangle.h \
 	rzx.h \
@@ -196,6 +124,7 @@ noinst_HEADERS = bitmap.h \
 	snapshot.h \
 	sound.h \
 	spectrum.h \
+	svg.h \
 	tape.h \
 	utils.h \
 	options.h \
@@ -208,122 +137,64 @@ EXTRA_DIST = AUTHORS \
 	     THANKS \
 	     keysyms.dat \
 	     keysyms.pl \
-	     m4/glib-2.0.m4 \
+	     m4/ax_create_stdint_h.m4 \
+	     m4/ax_pthread.m4 \
+	     m4/ax_string_strcasecmp.m4 \
 	     m4/gtk-2.0.m4 \
-	     m4/libxml.m4 \
 	     m4/pkg.m4 \
 	     m4/sdl.m4 \
 	     menu_data.dat \
 	     menu_data.pl \
-	     settings.pl \
-	     settings-header.pl \
 	     settings.dat \
-	     winfuse.ico
+	     settings.pl \
+	     settings-header.pl

 CLEANFILES = options.h \
 	     settings.c \
 	     settings.h

-include compat/Makefile.am
-
-if COMPAT_WIN32
-
-package_win32=$(PACKAGE)-$(PACKAGE_VERSION)-win32
-top_win32dir=$(top_builddir)/$(package_win32)
+DISTCLEANFILES =

-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) {} \;
+pkgdata_DATA =

-install-win32-strip: install-win32
-	test -z "$(STRIP)" || $(STRIP) $(DESTDIR)/fuse$(EXEEXT)

-dist-win32-dir:
-	$(MAKE) DESTDIR="$(top_win32dir)" install-win32-strip
-
-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