summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2025-09-26 06:19:00 +1000
committer Vas Crabb <vas@vastheman.com>2025-09-26 06:19:00 +1000
commitbc4eb11659eb34e0584ee94d5e9d6474aa229ba8 (patch)
tree1be756b8ef7faf95cb801849b62079345e9df139
parent5bdf99541358289a01f66ae6e10d26548a84a65b (diff)
parent2843a3deb81cf93735244044894196ccfbea4d20 (diff)
Merge tag 'mame0281' into HEAD
MAME 0.281
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--docs/source/conf.py4
-rw-r--r--docs/source/initialsetup/mameintro.rst23
-rw-r--r--makefile4
-rw-r--r--src/mame/igs/goldstar.cpp10
-rw-r--r--src/mame/misc/gluck2.cpp4
6 files changed, 29 insertions, 20 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 0f7ea532e57..8d7acdccdb0 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
- android:versionCode="280"
- android:versionName="0.280"
+ android:versionCode="281"
+ android:versionName="0.281"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->
diff --git a/docs/source/conf.py b/docs/source/conf.py
index e957196eae1..850c90c3d9c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -63,9 +63,9 @@ copyright = u'1997-2025, MAMEdev and contributors'
# built documents.
#
# The short X.Y version.
-version = '0.280'
+version = '0.281'
# The full version, including alpha/beta/rc tags.
-release = '0.280'
+release = '0.281'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/source/initialsetup/mameintro.rst b/docs/source/initialsetup/mameintro.rst
index 61be99b68a9..09d69b85f6a 100644
--- a/docs/source/initialsetup/mameintro.rst
+++ b/docs/source/initialsetup/mameintro.rst
@@ -68,14 +68,23 @@ MAME is written in C++, and has been ported to numerous platforms. Over time, as
computer hardware has evolved, the MAME code has evolved as well to take
advantage of the greater processing power and hardware capabilities offered.
-The official MAME binaries are compiled and designed to run on a standard
-Windows-based system. The minimum requirements are:
-
-* Intel Core 2-series CPU or equivalent, at least 2.0 GHz
-* 64-bit OS (Windows 7 or later on Windows, macOS 10.9 or later on Mac)
+The official MAME binary packages are compiled and designed to run on standard
+Windows-based systems. The minimum requirements are:
+
+* An x86-64 CPU implementing the x86-64v2 feature set (16-byte compare/exchange,
+ ``lahf``/``sahf`` instructions in long mode, population count instruction and
+ SSE 4.2), or
+* An Arm CPU implementing the ARMv8.2-A feature set
+* A 64-bit edition of Windows 7 or later for x86-64 or Windows 10 or later for
+ Arm
* 4 GB RAM
-* DirectX 9.0c for Windows
-* A Direct3D, or OpenGL capable graphics card
+* DirectX 9.0c for Windows
+* A Direct3D or OpenGL capable GPU with support for non-power-of-two texture
+ sizes
+
+In general, any x86-64 CPU from 2015 onwards or the vast majority of 64-bit Arm
+CPUs from 2018 onwards should be suitable. It is possible to compile MAME
+yourself with support for older CPUs at the cost of some performance.
Of course, the minimum requirements are just that: minimal. You may not get
optimal performance from such a system, but MAME should run. Modern versions of
diff --git a/makefile b/makefile
index b67fde0505c..fbd91c978a5 100644
--- a/makefile
+++ b/makefile
@@ -1528,7 +1528,7 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.280"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.281"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1538,7 +1538,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo #define BARE_BUILD_VERSION "0.280" > $@
+ @echo #define BARE_BUILD_VERSION "0.281" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@
diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp
index bbd3625de0f..0d065cd3991 100644
--- a/src/mame/igs/goldstar.cpp
+++ b/src/mame/igs/goldstar.cpp
@@ -27292,10 +27292,10 @@ GAMEL( 1996, 3cdpoker, 0, cd3poker, cmv4, cmaster_state, init_3cdp
GAMEL( 1996, 3cdpokera, 3cdpoker, cd3poker, cmv4, cmaster_state, init_3cdp, ROT0, "Armaly Labs", "3 Cards Poker 96 (V1.0)", 0, layout_cmv4 )
GAMEL( 1991, cmaster, 0, cm, cmaster, cmaster_state, empty_init, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 1)", 0, layout_cmaster )
GAMEL( 1991, cmasterb, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 2)", 0, layout_cmasterb )
-GAMEL( 1991, cm1codar, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "CODERE Argentina", "Cherry Master I (ver.1.01, spanish, CODERE, set 1)", 0, layout_cmasterb )
-GAMEL( 1991, cm1codara, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "CODERE Argentina", "Cherry Master I (ver.1.01, spanish, CODERE, set 2)", 0, layout_cmasterb )
-GAMEL( 1991, cm1codarb, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "CODERE Argentina", "Cherry Master I (ver.1.01, spanish, CODERE, set 3)", 0, layout_cmasterb )
-GAMEL( 1991, cm1spa, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, spanish, Dyna)", 0, layout_cmasterb )
+GAMEL( 1991, cm1codar, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "CODERE Argentina", "Cherry Master I (ver.1.01, Spanish, CODERE, set 1)", 0, layout_cmasterb )
+GAMEL( 1991, cm1codara, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "CODERE Argentina", "Cherry Master I (ver.1.01, Spanish, CODERE, set 2)", 0, layout_cmasterb )
+GAMEL( 1991, cm1codarb, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "CODERE Argentina", "Cherry Master I (ver.1.01, Spanish, CODERE, set 3)", 0, layout_cmasterb )
+GAMEL( 1991, cm1spa, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, Spanish, Dyna)", 0, layout_cmasterb )
GAMEL( 1991, packsystem, cmaster, cm, cmasterb, cmaster_state, init_cmezspina, ROT0, "bootleg", "Pack System (Game FB55 ver.2, encrypted)", 0, layout_cmasterb )
GAMEL( 1991, cmezspin, cmaster, cm, cmezspin, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (E-Z Spin bootleg / hack)", 0, layout_cmezspin ) // CM Fruit Bonus 55 ver.2 bootleg/hack
GAMEL( 199?, cmezspina, cmaster, cm, cmezspin, cmaster_state, init_cmezspina, ROT0, "bootleg", "Cherry Master I (E-Z Spin Hands Count bootleg / hack, set 1)", 0, layout_cmezspin )
@@ -27312,7 +27312,7 @@ GAMEL( 1991, cmasterj, cmaster, cm, cmasterb, cmaster_state, init_cmv4
GAMEL( 1991, cmasterk, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 11, TAKE stops all)", 0, layout_cmasterb )
GAMEL( 1991, cmasterl, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 12)", 0, layout_cmasterb )
GAMEL( 1991, skillmst, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Skill Master (ver.fst v5.0)", 0, layout_cmasterb )
-GAMEL( 1991, skillmsta, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Skill Master (Ver.fst v3.0)", 0, layout_cmasterb )
+GAMEL( 1991, skillmsta, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Skill Master (ver.fst v3.0)", 0, layout_cmasterb )
GAMEL( 1991, cutyline, 0, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cuty Line (LC-88, ver.1.01)", 0, layout_cmasterb )
GAMEL( 1991, cutylinea, cutyline, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Cuty Line (LC-88 bootleg, ver.8.05C)", MACHINE_NOT_WORKING, layout_cmasterb ) // needs correct memory map
GAMEL( 1991, cutylineb, cutyline, cutylineb,cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Cuty Line (LC-88 bootleg, ver.7C.14)", MACHINE_NOT_WORKING, layout_cmasterb ) // needs correct memory map
diff --git a/src/mame/misc/gluck2.cpp b/src/mame/misc/gluck2.cpp
index 58efb4b5827..9ad24d2a1c6 100644
--- a/src/mame/misc/gluck2.cpp
+++ b/src/mame/misc/gluck2.cpp
@@ -3,7 +3,7 @@
/******************************************************************************
Good Luck II
- Si Se 7 (4-colors 7's)
+ 四色7 (Sì Sè 7)
Yung Yu / CYE, 1992.
@@ -735,4 +735,4 @@ ROM_END
// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS...
GAME( 1992, gluck2, 0, gluck2, gluck2, gluck2_state, empty_init, ROT0, "Yung Yu / CYE", "Good Luck II", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sise7, 0, sise7, sise7, gluck2_state, empty_init, ROT0, "Yung Yu / CYE", "Si Se 7 (4-colors 7's)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sise7, 0, sise7, sise7, gluck2_state, empty_init, ROT0, "Yung Yu / CYE", "Si Se 7", MACHINE_SUPPORTS_SAVE )