Skip to content

Commit d985c98

Browse files
committed
Merge tag 'mame0273' into HEAD
MAME 0.273
2 parents ded3ddb + e11cae0 commit d985c98

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

android-project/app/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="org.mamedev.mame"
7-
android:versionCode="272"
8-
android:versionName="0.272"
7+
android:versionCode="273"
8+
android:versionName="0.273"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = '0.272'
66+
version = '0.273'
6767
# The full version, including alpha/beta/rc tags.
68-
release = '0.272'
68+
release = '0.273'
6969

7070
# The language for content autogenerated by Sphinx. Refer to documentation
7171
# for a list of supported languages.

docs/source/initialsetup/compilingmame.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ configuration::
184184
Building with Microsoft Visual Studio
185185
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
186186

187-
* You can generate Visual Studio 2019 projects using **make vs2019**. The
187+
* You can generate Visual Studio 2022 projects using **make vs2022**. The
188188
solution and project files will be created in
189-
``build/projects/windows/mame/vs2019`` by default (the name of the ``build``
189+
``build/projects/windows/mame/vs2022`` by default (the name of the ``build``
190190
folder can be changed using the ``BUILDDIR`` option). This will always
191191
regenerate the settings, so **REGENIE=1** is *not* needed.
192192
* Adding **MSBUILD=1** to the make options will build the solution using
@@ -766,7 +766,7 @@ The MSVC compiler produces spurious warnings about potentially uninitialised
766766
local variables. You currently need to add ``NOWERROR=1`` to the options passed
767767
to make when generating the Visual Studio project files. This stops warnings
768768
from being treated as errors. (MSVC seems to lack options to control which
769-
specific warnings are treated as error, which other compilers support.)
769+
specific warnings are treated as errors, which other compilers support.)
770770

771771

772772
.. _compiling-unusual:

hash/apple2_flop_misc.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Generated by SLIST 0.2.1
5050
</software>
5151

5252
<software name="a2diag31">
53-
<description>Apple II Diagnostic Disk (version 3.1)(800K 3.5")</description>
53+
<description>Apple II Diagnostic Disk (version 3.1) (800K 3.5")</description>
5454
<year>1991</year>
5555
<publisher>Apple Computer</publisher>
5656
<info name="usage" value="Requires an Apple IIgs, IIc+, //c, //e with a compatible drive controller card." />

hash/ibm5170_cdrom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8492,7 +8492,7 @@ Installation and Open Circulation CDs are bootable.
84928492
</software>
84938493

84948494
<software name="winnt40e" cloneof="winnt40">
8495-
<description>Windows NT Server, Enterpise Edition 4.0 (4.0.1381.4)</description>
8495+
<description>Windows NT Server, Enterprise Edition 4.0 (4.0.1381.4)</description>
84968496
<year>1997</year>
84978497
<publisher>Microsoft</publisher>
84988498
<notes><![CDATA[

makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ endif
15781578

15791579
ifeq (posix,$(SHELLTYPE))
15801580
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1581-
@echo '#define BARE_BUILD_VERSION "0.272"' > $@
1581+
@echo '#define BARE_BUILD_VERSION "0.273"' > $@
15821582
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
15831583
@echo 'extern const char bare_build_version[];' >> $@
15841584
@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
15881588
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
15891589
else
15901590
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1591-
@echo #define BARE_BUILD_VERSION "0.272" > $@
1591+
@echo #define BARE_BUILD_VERSION "0.273" > $@
15921592
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
15931593
@echo extern const char bare_build_version[]; >> $@
15941594
@echo extern const char bare_vcs_revision[]; >> $@

src/mame/wing/luckgrln.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,6 @@ ROM_END
968968
**********************************************/
969969

970970
// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULL NAME FLAGS LAYOUT
971-
GAMEL( 1991, luckgrln, 0, luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Girl (newer Z180 based hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln )
972-
GAMEL( 1991, luckstrn, 0, luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Star (newer Z180 based hardware)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln ) // missing internal ROM dump
971+
GAMEL( 1991, luckgrln, 0, luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Girl (newer Z180-based hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln )
972+
GAMEL( 1991, luckstrn, 0, luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Star (newer Z180-based hardware)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln ) // missing internal ROM dump
973973
GAMEL( 1993, 7smash, 0, _7smash, _7smash, luckgrln_state, empty_init, ROT0, "Sovic", "7 Smash", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_7smash )

0 commit comments

Comments
 (0)