Merge /u/bertogg/fuse-emulator/ branch misc-1_8_0-fixes into master

https://sourceforge.net/p/fuse-emulator/fuse/merge-requests/42/

Author: Fredrick Meunier

Makefile.am

@@ -213,6 +213,7 @@ include unittests/Makefile.am
 include z80/Makefile.am
 
 check-local: fuse unittests/displaytest unittests/sdl2displaytest unittests/sdl2scalerstatetest unittests/sdl2joysticktest unittests/sdl2mousetest
+	@test -e $(top_builddir)/roms || ln -sf "$(abs_top_srcdir)/roms" $(top_builddir)/roms
 	$(top_builddir)/fuse --unittests
 	$(top_builddir)/unittests/displaytest
 	$(top_builddir)/unittests/sdl2displaytest

data/Makefile.am

@@ -112,6 +112,7 @@ endif
 
 EXTRA_DIST += \
               data/net.sourceforge.fuse_emulator.Fuse.desktop.in \
+              data/net.sourceforge.fuse_emulator.Fuse.metainfo.xml \
               data/fuse.xml.in \
               data/shell-completion/diff_options.sh \
               data/win32/fuse.manifest.in \

ui/xlib/xstatusbar.pl

@@ -40,7 +40,7 @@
 #print "};\n";
 
 
-my $xstates = join(', ', keys %xstates);
+my $xstates = join(', ', sort keys %xstates);
 my $idx = 1000;
 my $w;
 foreach(sort keys %xoverlay) {

unittests/displaytest.c

@@ -27,13 +27,13 @@
 
 #include <string.h>
 
-#include "../compat.h"
-#include "../infrastructure/startup_manager.h"
-#include "../machine.h"
-#include "../memory_pages.h"
-#include "../peripherals/scld.h"
-#include "../rectangle.h"
-#include "../settings.h"
+#include "compat.h"
+#include "infrastructure/startup_manager.h"
+#include "machine.h"
+#include "memory_pages.h"
+#include "peripherals/scld.h"
+#include "rectangle.h"
+#include "settings.h"
 
 libspectrum_dword tstates;