Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

MAME 0.237

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmF3iSMACgkQwXSxAYxA
 cQ6M6A//aq6fZhNtwCuHMXgpN7G854MSs/ogh0H7LcgtxS8ScuhbcOO2IUQapqYy
 TTr4ztRkqDkFMdAASLLlh3PUsl315rHqfl+B1FrFNMpw+X/fQiPvv1cRlwVOZLCR
 Ipk3LSx3rCtXTjzw2IGxpi9ToJuS7vPrKTpxX5npfPiwsMUX1P76y72LoLUTJ/BF
 psU8A4XFpDHICEOQFY3085GMtqmeE0bFs8H4aEubneLNWQYJ0id967Dv9vyqv6Gq
 6UC6CS8PEe0dG5IbzW5m3hDCgnNwFdWPzWcvE6NmWA1lke21fxZB7jH/tJ2MMOg3
 /kXtS3DOX5sPAKYvtXQ2NDAeRZSxYPZscoeLTq9zjf/PVhPj0o6voK0YlkTEXhmh
 im9Rntil52uI91aUPjUneq2vVOBMLy1hlT3kJRV2WCIuIxtw1xjE1SWBbjBRDf9X
 i6mj9puhbHKzV+rhumrU0iZhDbRYN1NOGAsTqqtTyhSj1L20myGpIOmgjW2MtsJ5
 V3eCdC/F/IoWrFE20dIWrxgIgQj8jB2W/5/6XHZzgsqSMsurR94iKKgUezjvpGHb
 3T/HFIFUvkj7FOs565yzrLdn9y/Aj4IPWv6fLyZa1hYclRk0TuEhr9Az0qRH9FFU
 cRU3Wvf3ccwrVoVUiFadonVzZG9G8CcIkvC7k6GAJdHvBvkkSaY=
 =q0mw
 -----END PGP SIGNATURE-----

Merge tag 'mame0237' into mainline-master

MAME 0.237
This commit is contained in:
Vas Crabb 2021-10-27 01:45:16 +11:00
commit b0cec43b7e
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame" package="org.mamedev.mame"
android:versionCode="236" android:versionCode="237"
android:versionName="0.236" android:versionName="0.237"
android:installLocation="auto"> android:installLocation="auto">
<!-- OpenGL ES 2.0 --> <!-- OpenGL ES 2.0 -->

2
hash/nes.xml
View File

@ -62976,6 +62976,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<year>1999</year> <year>1999</year>
<publisher>EduBank</publisher> <publisher>EduBank</publisher>
<info name="alt_title" value="영재컴 꼬꼬마 Pack 1"/> <info name="alt_title" value="영재컴 꼬꼬마 Pack 1"/>
<info name="alt_title" value="Brilliant Com Cocoma Pack 1"/>
<part name="cart" interface="nes_cart"> <part name="cart" interface="nes_cart">
<feature name="slot" value="cocoma" /> <feature name="slot" value="cocoma" />
<dataarea name="prg" size="524288"> <dataarea name="prg" size="524288">
@ -62992,6 +62993,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<year>1999</year> <year>1999</year>
<publisher>EduBank</publisher> <publisher>EduBank</publisher>
<info name="alt_title" value="영재컴 꼬꼬마 Pack 2"/> <info name="alt_title" value="영재컴 꼬꼬마 Pack 2"/>
<info name="alt_title" value="Brilliant Com Cocoma Pack 2"/>
<part name="cart" interface="nes_cart"> <part name="cart" interface="nes_cart">
<feature name="slot" value="cocoma" /> <feature name="slot" value="cocoma" />
<dataarea name="prg" size="524288"> <dataarea name="prg" size="524288">

4
makefile
View File

@ -1546,7 +1546,7 @@ endif
ifeq (posix,$(SHELLTYPE)) ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.236"' > $@ @echo '#define BARE_BUILD_VERSION "0.237"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@
@ -1556,7 +1556,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
else else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.236" > $@ @echo #define BARE_BUILD_VERSION "0.237" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@

2
plugins/hiscore/init.lua
View File

@ -7,7 +7,7 @@
-- --
local exports = { local exports = {
name = 'hiscore', name = 'hiscore',
version = '1.0.0', version = '1.0.1',
description = 'Hiscore', description = 'Hiscore',
license = 'CC0', license = 'CC0',
author = { name = 'borgar@borgar.net' } } author = { name = 'borgar@borgar.net' } }

2
plugins/hiscore/plugin.json
View File

@ -2,7 +2,7 @@
"plugin": { "plugin": {
"name": "hiscore", "name": "hiscore",
"description": "Hiscore support", "description": "Hiscore support",
"version": "1.0.0", "version": "1.0.1",
"author": "borgar@borgar.net", "author": "borgar@borgar.net",
"type": "plugin", "type": "plugin",
"start": "false" "start": "false"