Skip to content

Commit

Permalink
Merge tag 'mame0253' into rel253
Browse files Browse the repository at this point in the history
MAME 0.253
  • Loading branch information
mahlemiut committed Mar 30, 2023
2 parents 0376b01 + b6d9756 commit 4e3e501
Show file tree
Hide file tree
Showing 20 changed files with 177 additions and 155 deletions.
4 changes: 2 additions & 2 deletions android-project/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="252"
android:versionName="0.252"
android:versionCode="253"
android:versionName="0.253"
android:installLocation="auto">

<!-- OpenGL ES 2.0 -->
Expand Down
5 changes: 4 additions & 1 deletion docs/source/initialsetup/compilingmame.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ All Platforms

* To compile MAME, you need a C++17 compiler and runtime library. We
support building with GCC version 7.2 or later and clang version 6 or
later. MAME should run with GNU libstdc++ version 7.2 or later.
later. MAME should run with GNU libstdc++ version 7.2 or later or
libc++ version 7 or later. The initial release of any major version
of GCC should be avoided. For example, if you want to compile MAME
with GCC 10, you should use version 10.3 or later.

* Whenever you are changing build parameters, (for example changing
optimisation settings, or adding tools to the compile list), or system
Expand Down
2 changes: 1 addition & 1 deletion hash/c128_flop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ license:CC0-1.0
</software>

<software name="1571de13">
<description>Commodre 128D/1571 Test/Demo Disk v1.3</description>
<description>Commodore 128D/1571 Test/Demo Disk v1.3</description>
<year>198?</year>
<publisher>Commodore</publisher>
<info name="serial" value="314855-02" />
Expand Down
38 changes: 19 additions & 19 deletions hash/camplynx_cass.xml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ license:CC0-1.0
</software>

<software name="labyrinth">
<description>Labyrinthe (Fra)</description>
<description>Labyrinthe (France)</description>
<year>1983</year>
<publisher>Quazar Computing</publisher>
<info name="usage" value="LOAD &quot;LABYRINTHE&quot;" />
Expand Down Expand Up @@ -301,7 +301,7 @@ license:CC0-1.0
</software>

<software name="mastermnd">
<description>Mastermind (96K)(Fra)</description>
<description>Mastermind (96K)(France)</description>
<year>198?</year>
<publisher>Willowsoft</publisher>
<info name="usage" value="LOAD &quot;MASTERMIND&quot;" />
Expand Down Expand Up @@ -337,7 +337,7 @@ license:CC0-1.0
</software>

<software name="moonfallf" cloneof="moonfall">
<description>Moonfall (Fra)</description>
<description>Moonfall (France)</description>
<year>1983</year>
<publisher>Camsoft</publisher>
<info name="usage" value="LOAD &quot;Moonfall2&quot;" />
Expand Down Expand Up @@ -386,7 +386,7 @@ license:CC0-1.0
</software>

<software name="numerons">
<description>Numerons (Fra)</description>
<description>Numerons (France)</description>
<year>1983</year>
<publisher>Camsoft</publisher>
<info name="usage" value="LOAD &quot;NUMERONS&quot;" />
Expand All @@ -411,7 +411,7 @@ license:CC0-1.0
</software>

<software name="asterix">
<description>L'odyssée d'Astérix (96K)(Fra)</description>
<description>L'odyssée d'Astérix (96K)(France)</description>
<year>198?</year>
<publisher>La Bibliothèque de Cintre</publisher>
<info name="usage" value="LOAD &quot;ASTERIX&quot;" />
Expand Down Expand Up @@ -509,7 +509,7 @@ license:CC0-1.0
</software>

<software name="scrablynx">
<description>ScrabLynx (96K)(Fra)</description>
<description>ScrabLynx (96K)(France)</description>
<year>1985</year>
<publisher>&lt;unknown&gt;</publisher>
<info name="author" value="Alain Sauget" />
Expand Down Expand Up @@ -597,7 +597,7 @@ license:CC0-1.0
</software>

<software name="wormf" cloneof="worm">
<description>The Worm (96K)(Fra)</description>
<description>The Worm (96K)(France)</description>
<year>1983</year>
<publisher>Quazar Computing</publisher>
<info name="usage" value="LOAD &quot;THE WORM&quot;" />
Expand All @@ -622,7 +622,7 @@ license:CC0-1.0
</software>

<software name="zombie">
<description>Zombie Panic (Fra)</description>
<description>Zombie Panic (France)</description>
<year>1983</year>
<publisher>Bus-Tech</publisher>
<info name="author" value="A.Miller" />
Expand All @@ -637,7 +637,7 @@ license:CC0-1.0
<!-- Applications -->

<software name="aide">
<description>Aide (Label-Procedures) (Fra)</description>
<description>Aide (Label-Procedures) (France)</description>
<year>198?</year>
<publisher>&lt;unknown&gt;</publisher>
<info name="usage" value="LOAD &quot;AIDE&quot;" />
Expand Down Expand Up @@ -693,7 +693,7 @@ license:CC0-1.0
</software>

<software name="disassmbf">
<description>Disassembler (Fra)</description>
<description>Disassembler (France)</description>
<year>198?</year>
<publisher>&lt;unknown&gt;</publisher>
<info name="usage" value="LOAD &quot;DES.IMP&quot;" />
Expand All @@ -705,7 +705,7 @@ license:CC0-1.0
</software>

<software name="disassmb">
<description>Lynx Disassembler (Fra)</description>
<description>Lynx Disassembler (France)</description>
<year>1983</year>
<publisher>Camsoft</publisher>
<info name="usage" value="LOAD &quot;DESASS&quot;" />
Expand All @@ -717,7 +717,7 @@ license:CC0-1.0
</software>

<software name="genbasic">
<description>Générateur Basic (Fra)</description>
<description>Générateur Basic (France)</description>
<year>1984</year>
<publisher>L'oeil de Lynx</publisher>
<info name="author" value="C.Aussage" />
Expand All @@ -730,7 +730,7 @@ license:CC0-1.0
</software>

<software name="gencarac">
<description>Générateur de Caracteres (96K)(Fra)</description>
<description>Générateur de Caracteres (96K)(France)</description>
<year>1984</year>
<publisher>L'oeil de Lynx</publisher>
<info name="usage" value="LOAD &quot;GENECAR&quot;" />
Expand All @@ -754,7 +754,7 @@ license:CC0-1.0
</software>

<software name="maths">
<description>Maths (Fra)</description>
<description>Maths (France)</description>
<year>198?</year>
<publisher>&lt;unknown&gt;</publisher>
<part name="cass1" interface="camplynx_cass">
Expand Down Expand Up @@ -810,7 +810,7 @@ license:CC0-1.0
</software>

<software name="chopin">
<description>Chopin (Fra)</description>
<description>Chopin (France)</description>
<year>1984</year>
<publisher>Tout Savoir sur Lynx</publisher>
<info name="usage" value="LOAD &quot;CHOPIN&quot;" />
Expand Down Expand Up @@ -855,7 +855,7 @@ license:CC0-1.0
</software>

<software name="gridtrap">
<description>Grid Trap (Fra)</description>
<description>Grid Trap (France)</description>
<year>1984</year>
<publisher>L'oeil de Lynx</publisher>
<info name="author" value="M.S.Fowkes" />
Expand All @@ -881,7 +881,7 @@ license:CC0-1.0
</software>

<software name="inteltab">
<description>IntelTab (96K)(Fra)</description>
<description>IntelTab (96K)(France)</description>
<year>1984</year>
<publisher>&lt;unknown&gt;</publisher>
<info name="author" value="A.Sauget" />
Expand All @@ -894,7 +894,7 @@ license:CC0-1.0
</software>

<software name="maximots">
<description>Maxi-Mots (96K)(Fra)</description>
<description>Maxi-Mots (96K)(France)</description>
<year>1984</year>
<publisher>L'oeil de Lynx</publisher>
<info name="author" value="M.Sauget" />
Expand Down Expand Up @@ -976,7 +976,7 @@ license:CC0-1.0
</software>

<software name="tronblkr">
<description>Tron Blocker (96K)(Fra)</description>
<description>Tron Blocker (96K)(France)</description>
<year>1984</year>
<publisher>NiLUG News</publisher>
<info name="author" value="Stephen Sawyer" />
Expand Down
6 changes: 3 additions & 3 deletions hash/m20.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ license:CC0-1.0

<software name="pcos13a" cloneof="pcos13" supported="no"><!-- Missing FM track0, Error 53 in kb.all -->
<!-- kb.all can be copied from pcos13 -->
<description>Olivetti PCOS 1.3 (Alt?)</description>
<description>Olivetti PCOS 1.3 (alt?)</description>
<year>1982</year>
<publisher>Olivetti</publisher>

Expand Down Expand Up @@ -340,7 +340,7 @@ license:CC0-1.0
</software>

<software name="multpland" cloneof="multplan"><!-- Missing FM track0 -->
<description>Multiplan (Ger)</description>
<description>Multiplan (Germany)</description>
<year>19??</year>
<publisher>Microsoft</publisher>
<info name="usage" value="Bootable pcos1.3; Select keyboard layout on first boot; Run with > mplan" />
Expand All @@ -353,7 +353,7 @@ license:CC0-1.0
</software>

<software name="olidraw">
<description>OliDraw (Ita)</description>
<description>OliDraw (Italian)</description>
<year>19??</year>
<publisher>Olivetti</publisher>
<info name="usage" value="Bootable pcos4.1a; Run with > ba &quot;olidraw.bas&quot; or > ba &quot;install.bas&quot;"/>
Expand Down
30 changes: 11 additions & 19 deletions hash/oric1_cass.xml
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ license:CC0-1.0
</software>

<software name="bataille">
<description>Bataille Des Couleurs, La</description>
<description>La Bataille Des Couleurs</description>
<year>1983</year>
<publisher>P &amp; A Jablonka</publisher>
<part name="cass" interface="oric1_cass">
Expand Down Expand Up @@ -380,7 +380,7 @@ license:CC0-1.0
</software>

<software name="bossthe">
<description>Boss, The</description>
<description>The Boss</description>
<year>19??</year>
<publisher>Peaksoft</publisher>
<part name="cass" interface="oric1_cass">
Expand Down Expand Up @@ -655,7 +655,7 @@ license:CC0-1.0
</software>

<software name="citemaudite">
<description>Cite Maudite, La</description>
<description>La Cite Maudite</description>
<year>1984</year>
<publisher>Ere Informatique</publisher>
<part name="cass" interface="oric1_cass">
Expand Down Expand Up @@ -810,11 +810,14 @@ license:CC0-1.0

<software name="crossbomber">
<description>Cross Bomber</description>
<year>2021</year>
<year>2022</year>
<publisher>Fabrizio Caruso</publisher>
<part name="cass" interface="oric1_cass">
<dataarea name="cass" size="6412">
<dataarea name="cass" size="6684">
<!-- originally released version seems to have disappeared off the Internet
<rom name="Cross Bomber (2021-05-13)(Caruso, Fabrizio)[48K].tap" size="6412" crc="5915840a" sha1="ab594aa3f6913c836956854374eafe243e4b457c"/>
-->
<rom name="Cross Bomber (2022-07-20)(Caruso, Fabrizio)[48K].tap" size="6684" crc="952b37c8" sha1="8298e07d262181611ab7286719830f5d66d670b6"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -863,17 +866,6 @@ license:CC0-1.0
</part>
</software>

<software name="crossshoot1" cloneof="crossshoot">
<description>Cross Shoot (alt)</description>
<year>2020</year>
<publisher>Fabrizio Caruso</publisher>
<part name="cass" interface="oric1_cass">
<dataarea name="cass" size="19190">
<rom name="Cross Shoot (2020-07-03)(Caruso, Fabrizio)[48K].tap" size="19190" crc="b8ba95d0" sha1="67f632ad5b1c5439f8f461c31d66308d6bfc00c8"/>
</dataarea>
</part>
</software>

<software name="crosssnake">
<description>Cross Snake (v2.0)</description>
<year>2020</year>
Expand Down Expand Up @@ -1007,7 +999,7 @@ license:CC0-1.0
</software>

<software name="diamantm">
<description>Diamant de l'île Maudite, Le</description>
<description>Le Diamant de l'île Maudite</description>
<year>1984</year>
<publisher>Loriciels</publisher>
<part name="cass1" interface="oric1_cass">
Expand Down Expand Up @@ -1693,7 +1685,7 @@ license:CC0-1.0
<publisher>Ocean</publisher>
<part name="cass" interface="oric1_cass">
<dataarea name="cass" size="24026">
<rom name="Hunchback (UK) (1983) [a2].tap " size="24026" crc="33327eef" sha1="0a8df6827b979be41686d903eedf773644a7ceea"/>
<rom name="Hunchback (UK) (1983) [a2].tap" size="24026" crc="33327eef" sha1="0a8df6827b979be41686d903eedf773644a7ceea"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -3180,7 +3172,7 @@ license:CC0-1.0
</software>

<software name="sceptre">
<description>Sceptre d'Anubis, Le</description>
<description>Le Sceptre d'Anubis</description>
<year>1984</year>
<publisher>Micro Programmes 5</publisher>
<part name="cass" interface="oric1_cass">
Expand Down
Loading

0 comments on commit 4e3e501

Please sign in to comment.