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

MAME 0.229

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmA1GjEACgkQwXSxAYxA
 cQ7iGhAAi5eF3mMHPN8Xm4sWjDsYnfgvTtTPf4lLlOnwD+GWZzhVkAxtwpq3o6IH
 g/+hWXMGHgSrp4mO6luyGwTn0Mgy+pOqHnHwT7PtZU4kFeM7G0f6fnUhT18VWtZM
 mNmNMFFACnwqAHHdUJ5OiCyrwDd5y6/yqot/AxD7u2Ia63W+YUPZc3CxntfG+Ecz
 mMTGSsM7f/eDFQKf2MXYsi4ImA4UELl+V4z/V0IytLbiUxgrm7JbHrSHP4hFpDe+
 piGzXdiJRP1Mo9ckkRt7EySdk0aR9zUiDQ2CuoFfXELAAdX8UK+IW8F/YlZYREEG
 9mFxLlbMC7iOjFHtwBA3hyTVn8KKRn1J791DiPzVJFnoWfgD2WXy1Y3CsE1Qbv0Q
 xnRJvNtT92iOqhi5I/l9tIK7u61sYrzhlF1+5yyi0EuuFW5ja2Atym+SgxHS3+Sq
 VTvasyhHcxN6LOC3zWhhaUXi9BrUjHkpiXd2J1frulPvq9vP0VNRUPPmZiCNUpog
 igVzNvHj3vWnJx/+M6RIHLpI1RN7RIHDrcNnTu/DO/GsV2EL2qvdEwmdG9/bCB/e
 O0ZiOPtE3M5a740u+4xpqxrUza5dE57xuppkQ8v0Quartoq2gFB2U3tl0fe61oUO
 8xbGqIKTaFB2JrL4OOT1k4W1XHoyR09Pfep5O9KqCrQCcHQD994=
 =btPl
 -----END PGP SIGNATURE-----

Merge tag 'mame0229' into mainline-master

MAME 0.229
This commit is contained in:
Vas Crabb 2021-02-24 13:40:11 +11:00
commit 805a333ebb
4 changed files with 7 additions and 7 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="228"
android:versionName="0.228"
android:versionCode="229"
android:versionName="0.229"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->

4
makefile
View File

@ -1745,14 +1745,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.228"' > $@
@echo '#define BARE_BUILD_VERSION "0.229"' > $@
@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.228" > $@
@echo #define BARE_BUILD_VERSION "0.229" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

2
src/mame/drivers/iez80.cpp
View File

@ -229,4 +229,4 @@ ROM_END
//**************************************************************************
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1983, iez80, 0, 0, iez80, iez80, iez80_state, empty_init, "Insight Enterprises", "Z80 SBC (Prototype?)", MACHINE_IS_SKELETON )
COMP( 1983, iez80, 0, 0, iez80, iez80, iez80_state, empty_init, "Insight Enterprises", "Z80 SBC (prototype?)", MACHINE_IS_SKELETON )

4
src/mame/drivers/jpmimpctsw.cpp
View File

@ -11988,8 +11988,8 @@ GAME( 199?, j6sonich, j6sonic, impact_nonvideo, j6sonic, jpmimpct_state,
GAME( 199?, j6roof, 0, impact_nonvideo, j6roof, jpmimpct_state, empty_init, ROT0, "Ace", "Thru' The Roof (Ace) (IMPACT) (set 1)", GAME_FLAGS )
GAME( 199?, j6roofa, j6roof, impact_nonvideo, j6roof, jpmimpct_state, empty_init, ROT0, "Ace", "Thru' The Roof (Ace) (IMPACT) (set 2)", GAME_FLAGS )
GAMEL( 199?, j6untch, 0, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3B LO6)", GAME_FLAGS_WORKING_NO_SOUND, layout_j6untch )
GAMEL( 199?, j6untcha, j6untch, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3BI LO6)", GAME_FLAGS_WORKING_NO_SOUND, layout_j6untch )
GAMEL( 199?, j6untch, 0, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3B LO6)", GAME_FLAGS, layout_j6untch )
GAMEL( 199?, j6untcha, j6untch, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3BI LO6)", GAME_FLAGS, layout_j6untch )
// VFD issues, but VFD is likely unused as it calls the game 'Some Indeterminate Club Machine' with clear placeholder text
GAMEL( 199?, j6wldkng, 0, impact_nonvideo, j6wldkng, jpmimpct_state, empty_init, ROT0, "JPM", "Wild King Club (JPM) (IMPACT) (set 1)", GAME_FLAGS, layout_j6wldkng )