Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 23:12:11 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

MAME 0.234

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmD/r8IACgkQwXSxAYxA
 cQ6A7hAAmUn5pLrwxyuogs/vtQWVKrgbnrbEksj2Mf4z62bKoajqIBUd1np5WwFw
 SvnzTyGUdzrfH2lUGjcwDuuYTyerYYrykiSULMB10bM9XIJFHsiVaq2gp36vHgw+
 hAte3+nO8e+TojEpS2I9Et/PqpYo4kpahnsQq7Q766bIj21zG3FgY4vuc9ro7R4p
 wZm8I8OflY+SRxFWdnZiZra1q4W7wvLw54ziKjnzFGG9NPl3aUWx9uNwf8EHYfzZ
 Q1xBZC9/PlumGDjpGPC2eBz0BMxgFjax4W0TnED+ODF1dEMS11R2bnB5GT2RPWXo
 G7b7WjT6bxQYNt/lWISQtCRiNP3al+A7knQjSPb5W1hIsCyOVdwVdRqLGNGnPo2i
 NpMLNBDRxN3i/socvir2Uz7niKuc9JWemStk2E7G5q8RZcV9p1Z3uPqY5H06bp15
 37tMRUQklyyxA/PrMn7epC9pUkxfDvrR2iuKkIL8MJcBSqHGyuf7IC/8uGqF1o/j
 Tlpj+AVtLD+5KNMY42ToimvCR+MaOJ+1QtvNzAbX2GN6Qc7kyT4Nbx2MEl6BwaKx
 e8qyNrNqqaEGrAb4KAN08F/hxbjPrFSCLYFojp30tTl6KJ/23MSUcOD5lJHR1yDh
 FJx7DMkU0r53N15Rx3BUO6PYop8cqO0a0Bog0BysZjXXOnetwKQ=
 =98Bl
 -----END PGP SIGNATURE-----

Merge tag 'mame0234' into mainline-master

MAME 0.234
This commit is contained in:
Vas Crabb 2021-07-28 12:59:58 +10:00
commit a3f413ac42
6 changed files with 10 additions and 10 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"
package="org.mamedev.mame"
android:versionCode="233"
android:versionName="0.233"
android:versionCode="234"
android:versionName="0.234"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->

2
hash/c64_cass.xml
View File

@ -623,7 +623,7 @@ Some are based on the C64 Tape Archive at https://archive.org/download/c64tapes/
</software>
<software name="advbasil">
<description>Adventures of Bond... Basildon Bond</description>
<description>Adventures of Bond... Basildon Bond</description>
<year>1986</year>
<publisher>Probe Software</publisher>

2
hash/ibm5170.xml
View File

@ -16491,7 +16491,7 @@ license:CC0
</software>
<software name="robocop3">
<description>Robocop 3"</description>
<description>Robocop 3</description>
<year>1992</year>
<publisher>Ocean</publisher>
<info name="developer" value="Digital Image Design" />

2
hash/neogeo.xml
View File

@ -6926,7 +6926,7 @@ license:CC0
-->
<software name="irrmaze">
<description>The Irritating Maze/ Ultra Denryu Iraira Bou</description>
<description>The Irritating Maze / Ultra Denryu Iraira Bou</description>
<year>1997</year>
<publisher>SNK / Saurus</publisher>
<info name="serial" value="??M-2360"/>

4
makefile
View File

@ -1760,14 +1760,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.233"' > $@
@echo '#define BARE_BUILD_VERSION "0.234"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.233" > $@
@echo #define BARE_BUILD_VERSION "0.234" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

6
src/mame/drivers/at.cpp
View File

@ -6075,7 +6075,7 @@ COMP( 198?, pccm216, ibm5170, 0, atturbo, 0, at_state, init_at
COMP( 1986, pcd2, ibm5170, 0, ibm5170, 0, at_state, init_at, "Siemens", "PCD-2", MACHINE_NOT_WORKING )
COMP( 1991, pcd204, ibm5170, 0, atturbo, 0, at_state, init_at, "Philips", "PCD204 (PCD200 series)", MACHINE_NOT_WORKING )
COMP( 198?, pcd2m, ibm5170, 0, atturbo, 0, at_state, init_at, "Siemens", "PCD-2M", MACHINE_NOT_WORKING )
COMP( 198?, peas286, ibm5170, 0, atturbo, 0, at_state, init_at, "Peacock computer", "S-286 Rev A", MACHINE_NOT_WORKING )
COMP( 198?, peas286, ibm5170, 0, atturbo, 0, at_state, init_at, "Peacock Computer", "S-286 Rev A", MACHINE_NOT_WORKING )
COMP( 1990, profpc33, ibm5170, 0, atturbo, 0, at_state, init_at, "Profex", "PC 33", MACHINE_NOT_WORKING )
COMP( 198?, prolite286,ibm5170, 0, neat, 0, at_state, init_at, "CAF", "Prolite 286/16", MACHINE_NOT_WORKING )
COMP( 198?, pwb7270e, ibm5170, 0, neat, 0, at_state, init_at, "Advanced Logic Research", "PWB 7270 REV E", MACHINE_NOT_WORKING )
@ -6113,7 +6113,7 @@ COMP( 199?, dfi386sx, ibm5170, 0, at386sx, 0, at_state, init_at
COMP( 199?, dvbslan, ibm5170, 0, at386sx, 0, at_state, init_at, "Datavan", "Book-Size LAN station", MACHINE_NOT_WORKING )
COMP( 199?, ecs8517, ibm5170, 0, at386sx, 0, at_state, init_at, "Elitegroup", "ECS 8517 v3.3", MACHINE_NOT_WORKING )
COMP( 199?, elt386sx, ibm5170, 0, at386sx, 0, at_state, init_at, "Elitegroup", "ELT-386SX-160BE", MACHINE_NOT_WORKING )
COMP( 198?, eltp9, ibm5170, 0, at386sx, 0, at_state, init_at, "Chaintech", "ELT-P9 / Most likely ELT-386SX-160D", MACHINE_NOT_WORKING )
COMP( 198?, eltp9, ibm5170, 0, at386sx, 0, at_state, init_at, "Chaintech", "ELT-P9 / most likely ELT-386SX-160D", MACHINE_NOT_WORKING )
COMP( 198?, epsax3, ibm5170, 0, at386sx, 0, at_state, init_at, "Epson", "PC AX3", MACHINE_NOT_WORKING )
COMP( 19??, ht18c, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "unknown 386sx AT clones (HT18/C chipset)", MACHINE_NOT_WORKING )
COMP( 199?, ibm2121, ibm5170, 0, at386sx, 0, at_state, init_at, "International Business Machines", "PS/1 2121", MACHINE_NOT_WORKING )
@ -6124,7 +6124,7 @@ COMP( 198?, ktx20t02, ibm5170, 0, at386sx, 0, at_state, init_at
COMP( 199?, mbc18nb, ibm5170, 0, at386sx, 0, at_state, init_at, "Sanyo", "MBC-18NB", MACHINE_NOT_WORKING )
COMP( 1992, mbc28, ibm5170, 0, at386sx, 0, at_state, init_at, "Sanyo", "MBC-28", MACHINE_NOT_WORKING ) // Complains about missing mouse hardware
COMP( 1993, megapc, 0, 0, megapc, 0, megapc_state, init_megapc, "Amstrad plc", "MegaPC", MACHINE_NOT_WORKING )
COMP( 199?, mmbo4088, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "486MMBO4088 (TI TX486SLC/E", MACHINE_NOT_WORKING )
COMP( 199?, mmbo4088, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "486MMBO4088 (TI TX486SLC/E)", MACHINE_NOT_WORKING )
COMP( 199?, mokp386sx, ibm5170, 0, at386sx, 0, at_state, init_at, "Morse", "KP 386SX V2.21", MACHINE_NOT_WORKING )
COMP( 199?, ocpanii, ibm5170, 0, at386sx, 0, at_state, init_at, "Octek", "Panther II", MACHINE_NOT_WORKING )
COMP( 199?, op82c283, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "386sx motherboards using the OPTi 82C283 chipset", MACHINE_NOT_WORKING )