.github/workflows/linuxbuild.yml

@@ -22,9 +22,7 @@ jobs:
     - name: Determine version
       id: get_version
       run: |
-        OPENMSX_MAJOR_VERSION=`python3 build/version.py`
-        OPENMSX_BUILD_REVISION=`fgrep "Revision string:" derived/version.log | sed -e "s/.*: //"`
-        OPENMSX_VERSION=$OPENMSX_MAJOR_VERSION-$OPENMSX_BUILD_REVISION
+        OPENMSX_VERSION=`python3 build/version.py`
         echo ::set-output name=OPENMSX_VERSION::$OPENMSX_VERSION
     - name: Create redistributable zip
       run: |

.github/workflows/macosbuild.yml

@@ -20,9 +20,7 @@ jobs:
     - name: Determine version
       id: get_version
       run: |
-        OPENMSX_MAJOR_VERSION=`python3 build/version.py`
-        OPENMSX_BUILD_REVISION=`fgrep "Revision string:" derived/version.log | sed -e "s/.*: //"`
-        OPENMSX_VERSION=$OPENMSX_MAJOR_VERSION-$OPENMSX_BUILD_REVISION
+        OPENMSX_VERSION=`python3 build/version.py`
         echo ::set-output name=OPENMSX_VERSION::$OPENMSX_VERSION
     - name: Rename redistributable dmg
       run: |

.github/workflows/windowsbuild.yml

@@ -28,9 +28,7 @@ jobs:
     - name: Determine version
       id: get_version
       run: |
-        OPENMSX_MAJOR_VERSION=`python3 build/version.py`
-        OPENMSX_BUILD_REVISION=`fgrep "Revision string:" derived/version.log | sed -e "s/.*: //"`
-        OPENMSX_VERSION=$OPENMSX_MAJOR_VERSION-$OPENMSX_BUILD_REVISION
+        OPENMSX_VERSION=`python3 build/version.py`
         echo ::set-output name=OPENMSX_VERSION::$OPENMSX_VERSION
     - name: Create redistributable zip
       run: cd derived/x86_64-mingw-w64-opt-3rd/bindist/install && zip -r ../openmsx-${{ steps.get_version.outputs.OPENMSX_VERSION }}-x86_64-mingw-w64-opt.zip *

Contrib/tas/omr2txt.py

@@ -21,6 +21,10 @@ vdpTicksPerLine = 1368
 inputMap = {
 	'r': (8, 7), 'd': (8, 6), 'u': (8, 5), 'l': (8, 4), 's': (8, 0)
 	}
+# Coleco:
+#inputMap = {
+#	'r': (0, 1), 'd': (0, 2), 'u': (0, 0), 'l': (0, 3), 's': (0, 6), 'o': (2, 1)
+#	}
 inputMapReverse = dict((pos, name) for name, pos in inputMap.items())
 
 def readEvents(filename):

build/3rdparty/SDL-1.2.15.diff

@@ -1,65 +0,0 @@
-diff -ru SDL-1.2.15.org/src/video/quartz/SDL_QuartzEvents.m SDL-1.2.15/src/video/quartz/SDL_QuartzEvents.m
---- SDL-1.2.15.org/src/video/quartz/SDL_QuartzEvents.m	2012-01-19 07:30:06.000000000 +0100
-+++ SDL-1.2.15/src/video/quartz/SDL_QuartzEvents.m	2013-10-23 07:16:42.000000000 +0200
-@@ -345,7 +345,9 @@
-         the scancode/keysym.
-     */
-     if (SDL_TranslateUNICODE && state == SDL_PRESSED) {
--        [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
-+        if (!([event modifierFlags] & NSCommandKeyMask)) {
-+            [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
-+        }
-         chars = [ event characters ];
-         numChars = [ chars length ];
-         if (numChars > 0)
-@@ -383,7 +385,7 @@
-         }
-     }
-     
--    if (SDL_getenv ("SDL_ENABLEAPPEVENTS"))
-+    if (SDL_getenv ("SDL_ENABLEAPPEVENTS") && !(mode_flags & SDL_FULLSCREEN))
-         [ NSApp sendEvent:event ];
- }
- 
-diff -ru SDL-1.2.15.org/src/video/quartz/SDL_QuartzVideo.h SDL-1.2.15/src/video/quartz/SDL_QuartzVideo.h
---- SDL-1.2.15.org/src/video/quartz/SDL_QuartzVideo.h	2012-01-19 07:30:06.000000000 +0100
-+++ SDL-1.2.15/src/video/quartz/SDL_QuartzVideo.h	2014-04-04 23:48:34.000000000 +0200
-@@ -91,7 +91,9 @@
-     CGDirectDisplayID  display;            /* 0 == main display (only support single display) */
-     const void         *mode;              /* current mode of the display */
-     const void         *save_mode;         /* original mode of the display */
-+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
-     CGDirectPaletteRef palette;            /* palette of an 8-bit display */
-+#endif
-     NSOpenGLContext    *gl_context;        /* OpenGL rendering context */
-     NSGraphicsContext  *nsgfx_context;     /* Cocoa graphics context */
-     Uint32             width, height, bpp; /* frequently used data about the display */
-diff -ru SDL-1.2.15.org/src/video/quartz/SDL_QuartzWindow.h SDL-1.2.15/src/video/quartz/SDL_QuartzWindow.h
---- SDL-1.2.15.org/src/video/quartz/SDL_QuartzWindow.h	2012-01-19 07:30:06.000000000 +0100
-+++ SDL-1.2.15/src/video/quartz/SDL_QuartzWindow.h	2013-10-23 07:16:42.000000000 +0200
-@@ -38,6 +38,7 @@
- - (void)appWillUnhide:(NSNotification*)note;
- - (void)appDidUnhide:(NSNotification*)note;
- - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag;
-+- (BOOL)performKeyEquivalent:(NSEvent*)event;
- @end
- 
- /* Delegate for our NSWindow to send SDLQuit() on close */
-diff -ru SDL-1.2.15.org/src/video/quartz/SDL_QuartzWindow.m SDL-1.2.15/src/video/quartz/SDL_QuartzWindow.m
---- SDL-1.2.15.org/src/video/quartz/SDL_QuartzWindow.m	2012-01-19 07:30:06.000000000 +0100
-+++ SDL-1.2.15/src/video/quartz/SDL_QuartzWindow.m	2013-10-23 07:16:42.000000000 +0200
-@@ -197,6 +197,14 @@
-     return [ super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag ];
- }
- 
-+- (BOOL)performKeyEquivalent:(NSEvent*)event
-+{
-+    /* give the menu a chance to handle the key equivalent */
-+    [[NSApp mainMenu] performKeyEquivalent:event];
-+    /* avoid beep by pretending we handled it */
-+    return YES;	
-+}
-+
- @end
- 
- @implementation SDL_QuartzWindowDelegate

build/3rdparty/SDL_ttf-2.0.11.diff

@@ -1,12 +0,0 @@
-diff -ru SDL_ttf-2.0.11.org/Makefile.in SDL_ttf-2.0.11/Makefile.in
---- SDL_ttf-2.0.11.org/Makefile.in	2012-01-15 05:44:08.000000000 +0100
-+++ SDL_ttf-2.0.11/Makefile.in	2012-08-05 22:55:28.000000000 +0200
-@@ -353,7 +353,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libSDL_ttf.la: $(libSDL_ttf_la_OBJECTS) $(libSDL_ttf_la_DEPENDENCIES) 
--	$(libSDL_ttf_la_LINK) -rpath $(libdir) $(libSDL_ttf_la_OBJECTS) $(libSDL_ttf_la_LIBADD) $(LIBS)
-+	$(libSDL_ttf_la_LINK) -rpath $(libdir) $(libSDL_ttf_la_OBJECTS) $(libSDL_ttf_la_LIBADD)
- 
- clean-noinstPROGRAMS:
- 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \

build/3rdparty/freetype-2.4.12.diff

@@ -1,306 +0,0 @@
-diff -ru freetype-2.4.12.orig/include/freetype/config/ftoption.h freetype-2.4.12/include/freetype/config/ftoption.h
---- freetype-2.4.12.orig/include/freetype/config/ftoption.h	2013-01-22 14:31:11.000000000 +0100
-+++ freetype-2.4.12/include/freetype/config/ftoption.h	2013-05-18 12:01:54.000000000 +0200
-@@ -148,7 +148,7 @@
-   /*                                                                       */
-   /*   Define this macro if you want to enable this `feature'.             */
-   /*                                                                       */
--#define FT_CONFIG_OPTION_USE_LZW
-+/* #define FT_CONFIG_OPTION_USE_LZW */
- 
- 
-   /*************************************************************************/
-@@ -163,7 +163,7 @@
-   /*   Define this macro if you want to enable this `feature'.  See also   */
-   /*   the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below.                       */
-   /*                                                                       */
--#define FT_CONFIG_OPTION_USE_ZLIB
-+/* #define FT_CONFIG_OPTION_USE_ZLIB */
- 
- 
-   /*************************************************************************/
-@@ -296,7 +296,7 @@
-   /*   able to synthesize a Unicode charmap out of the glyphs found in the */
-   /*   fonts.                                                              */
-   /*                                                                       */
--#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-+#undef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
- 
- 
-   /*************************************************************************/
-@@ -309,7 +309,7 @@
-   /*                                                                       */
-   /*   Note that the `FOND' resource isn't checked.                        */
-   /*                                                                       */
--#define FT_CONFIG_OPTION_MAC_FONTS
-+/* #define FT_CONFIG_OPTION_MAC_FONTS */
- 
- 
-   /*************************************************************************/
-@@ -487,7 +487,7 @@
-   /* embedded bitmaps in all formats using the SFNT module (namely         */
-   /* TrueType & OpenType).                                                 */
-   /*                                                                       */
--#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-+/* #define TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
- 
- 
-   /*************************************************************************/
-@@ -502,7 +502,7 @@
-   /*                                                                       */
-   /* (By default, the module uses `PSNames' to extract glyph names.)       */
-   /*                                                                       */
--#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-+#undef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
- 
- 
-   /*************************************************************************/
-@@ -516,7 +516,7 @@
-   /* Accessing SFNT names is done through the functions declared in        */
-   /* `freetype/ftsnames.h'.                                                */
-   /*                                                                       */
--#define TT_CONFIG_OPTION_SFNT_NAMES
-+/* #define TT_CONFIG_OPTION_SFNT_NAMES */
- 
- 
-   /*************************************************************************/
-@@ -669,7 +669,7 @@
-   /* and avar tables).  This has many similarities to Type 1 Multiple      */
-   /* Masters support.                                                      */
-   /*                                                                       */
--#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
-+/* #define TT_CONFIG_OPTION_GX_VAR_SUPPORT */
- 
- 
-   /*************************************************************************/
-@@ -677,7 +677,7 @@
-   /* Define TT_CONFIG_OPTION_BDF if you want to include support for        */
-   /* an embedded `BDF ' table within SFNT-based bitmap formats.            */
-   /*                                                                       */
--#define TT_CONFIG_OPTION_BDF
-+/* #define TT_CONFIG_OPTION_BDF */
- 
- 
-   /*************************************************************************/
-@@ -723,7 +723,7 @@
-   /* files into an existing face.  Note that if set, the T1 driver will be */
-   /* unable to produce kerning distances.                                  */
-   /*                                                                       */
--#undef T1_CONFIG_OPTION_NO_AFM
-+#define T1_CONFIG_OPTION_NO_AFM
- 
- 
-   /*************************************************************************/
-diff -ru freetype-2.4.12.orig/modules.cfg freetype-2.4.12/modules.cfg
---- freetype-2.4.12.orig/modules.cfg	2011-11-26 13:19:10.000000000 +0100
-+++ freetype-2.4.12/modules.cfg	2013-05-18 12:06:58.000000000 +0200
-@@ -37,35 +37,35 @@
- # PostScript Type 1 font driver.
- #
- # This driver needs the `psaux', `pshinter', and `psnames' modules.
--FONT_MODULES += type1
-+#FONT_MODULES += type1
- 
- # CFF/OpenType font driver.
- #
- # This driver needs the `sfnt', `pshinter', and `psnames' modules.
--FONT_MODULES += cff
-+#FONT_MODULES += cff
- 
- # Type 1 CID-keyed font driver.
- #
- # This driver needs the `psaux', `pshinter', and `psnames' modules.
--FONT_MODULES += cid
-+#FONT_MODULES += cid
- 
- # PFR/TrueDoc font driver.  See optional extension ftpfr.c below also.
--FONT_MODULES += pfr
-+#FONT_MODULES += pfr
- 
- # PostScript Type 42 font driver.
- #
- # This driver needs the `truetype' and `psaux' modules.
--FONT_MODULES += type42
-+#FONT_MODULES += type42
- 
- # Windows FONT/FNT font driver.  See optional extension ftwinfnt.c below
- # also.
--FONT_MODULES += winfonts
-+#FONT_MODULES += winfonts
- 
- # PCF font driver.
--FONT_MODULES += pcf
-+#FONT_MODULES += pcf
- 
- # BDF font driver.  See optional extension ftbdf.c below also.
--FONT_MODULES += bdf
-+#FONT_MODULES += bdf
- 
- # SFNT files support.  If used without `truetype' or `cff', it supports
- # bitmap-only fonts within an SFNT wrapper.
-@@ -79,10 +79,10 @@
- ####
- 
- # FreeType's auto hinter.
--HINTING_MODULES += autofit
-+#HINTING_MODULES += autofit
- 
- # PostScript hinter.
--HINTING_MODULES += pshinter
-+#HINTING_MODULES += pshinter
- 
- # The TrueType hinting engine doesn't have a module of its own but is
- # controlled in file include/freetype/config/ftoption.h
-@@ -94,7 +94,7 @@
- ####
- 
- # Monochrome rasterizer.
--RASTER_MODULES += raster
-+#RASTER_MODULES += raster
- 
- # Anti-aliasing rasterizer.
- RASTER_MODULES += smooth
-@@ -107,7 +107,7 @@
- # FreeType's cache sub-system (quite stable but still in beta -- this means
- # that its public API is subject to change if necessary).  See
- # include/freetype/ftcache.h.  Needs ftglyph.c.
--AUX_MODULES += cache
-+#AUX_MODULES += cache
- 
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
- # AUX_MODULES += gxvalid
-@@ -115,12 +115,12 @@
- # Support for streams compressed with gzip (files with suffix .gz).
- #
- # See include/freetype/ftgzip.h for the API.
--AUX_MODULES += gzip
-+#AUX_MODULES += gzip
- 
- # Support for streams compressed with LZW (files with suffix .Z).
- #
- # See include/freetype/ftlzw.h for the API.
--AUX_MODULES += lzw
-+#AUX_MODULES += lzw
- 
- # Support for streams compressed with bzip2 (files with suffix .bz2).
- #
-@@ -134,13 +134,13 @@
- # Auxiliary PostScript driver component to share common code.
- #
- # This module depends on `psnames'.
--AUX_MODULES += psaux
-+#AUX_MODULES += psaux
- 
- # Support for PostScript glyph names.
- #
- # This module can be controlled in ftconfig.h
- # (FT_CONFIG_OPTION_POSTSCRIPT_NAMES).
--AUX_MODULES += psnames
-+#AUX_MODULES += psnames
- 
- 
- ####
-@@ -150,12 +150,12 @@
- # Exact bounding box calculation.
- #
- # See include/freetype/ftbbox.h for the API.
--BASE_EXTENSIONS += ftbbox.c
-+#BASE_EXTENSIONS += ftbbox.c
- 
- # Access BDF-specific strings.  Needs BDF font driver.
- #
- # See include/freetype/ftbdf.h for the API.
--BASE_EXTENSIONS += ftbdf.c
-+#BASE_EXTENSIONS += ftbdf.c
- 
- # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into
- # 8bpp format, and for emboldening of bitmap glyphs.
-@@ -166,17 +166,17 @@
- # Access CID font information.
- #
- # See include/freetype/ftcid.h for the API.
--BASE_EXTENSIONS += ftcid.c
-+#BASE_EXTENSIONS += ftcid.c
- 
- # Access FSType information.  Needs fttype1.c.
- #
- # See include/freetype/freetype.h for the API.
--BASE_EXTENSIONS += ftfstype.c
-+#BASE_EXTENSIONS += ftfstype.c
- 
- # Support for GASP table queries.
- #
- # See include/freetype/ftgasp.h for the API.
--BASE_EXTENSIONS += ftgasp.c
-+#BASE_EXTENSIONS += ftgasp.c
- 
- # Convenience functions to handle glyphs.  Needs ftbitmap.c.
- #
-@@ -186,32 +186,32 @@
- # Interface for gxvalid module.
- #
- # See include/freetype/ftgxval.h for the API.
--BASE_EXTENSIONS += ftgxval.c
-+#BASE_EXTENSIONS += ftgxval.c
- 
- # Support for LCD color filtering of subpixel bitmaps.
- #
- # See include/freetype/ftlcdfil.h for the API.
--BASE_EXTENSIONS += ftlcdfil.c
-+#BASE_EXTENSIONS += ftlcdfil.c
- 
- # Multiple Master font interface.
- #
- # See include/freetype/ftmm.h for the API.
--BASE_EXTENSIONS += ftmm.c
-+#BASE_EXTENSIONS += ftmm.c
- 
- # Interface for otvalid module.
- #
- # See include/freetype/ftotval.h for the API.
--BASE_EXTENSIONS += ftotval.c
-+#BASE_EXTENSIONS += ftotval.c
- 
- # Support for FT_Face_CheckTrueTypePatents.
- #
- # See include/freetype/freetype.h for the API.
--BASE_EXTENSIONS += ftpatent.c
-+#BASE_EXTENSIONS += ftpatent.c
- 
- # Interface for accessing PFR-specific data.  Needs PFR font driver.
- #
- # See include/freetype/ftpfr.h for the API.
--BASE_EXTENSIONS += ftpfr.c
-+#BASE_EXTENSIONS += ftpfr.c
- 
- # Path stroker.  Needs ftglyph.c.
- #
-@@ -221,24 +221,24 @@
- # Support for synthetic embolding and slanting of fonts.  Needs ftbitmap.c.
- #
- # See include/freetype/ftsynth.h for the API.
--BASE_EXTENSIONS += ftsynth.c
-+#BASE_EXTENSIONS += ftsynth.c
- 
- # Interface to access data specific to PostScript Type 1 and Type 2 (CFF)
- # fonts.
- #
- # See include/freetype/t1tables.h for the API.
--BASE_EXTENSIONS += fttype1.c
-+#BASE_EXTENSIONS += fttype1.c
- 
- # Interface for accessing data specific to Windows FNT files.  Needs winfnt
- # driver.
- #
- # See include/freetype/ftwinfnt.h for the API.
--BASE_EXTENSIONS += ftwinfnt.c
-+#BASE_EXTENSIONS += ftwinfnt.c
- 
- # Support functions for X11.
- #
- # See include/freetype/ftxf86.h for the API.
--BASE_EXTENSIONS += ftxf86.c
-+#BASE_EXTENSIONS += ftxf86.c
- 
- ####
- #### The components `ftsystem.c' (for memory allocation and stream I/O

build/3rdparty/tcl8.5.18.diff

@@ -1,12 +0,0 @@
-diff -ru tcl8.5.18.orig/win/Makefile.in tcl8.5.18/win/Makefile.in
---- tcl8.5.18.orig/win/Makefile.in	2015-03-06 16:13:58.000000000 +0100
-+++ tcl8.5.18/win/Makefile.in	2015-10-04 22:14:02.109235175 +0200
-@@ -606,7 +606,7 @@
- 	    $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/reg$(REGDOTVER); \
- 	    fi
- 
--install-libraries: libraries install-tzdata install-msgs
-+install-libraries: libraries
- 	@for i in $(prefix)/lib $(INCLUDE_INSTALL_DIR) \
- 		$(SCRIPT_INSTALL_DIR); \
- 	    do \