diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 849c6bd28a2..6d7879752e6 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/conf.py b/docs/source/conf.py index 8ac9328bedd..1d51dd55629 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2024, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.272' +version = '0.273' # The full version, including alpha/beta/rc tags. -release = '0.272' +release = '0.273' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst index 0d7b1f8459c..042a7fbbd85 100644 --- a/docs/source/initialsetup/compilingmame.rst +++ b/docs/source/initialsetup/compilingmame.rst @@ -184,9 +184,9 @@ configuration:: Building with Microsoft Visual Studio ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* You can generate Visual Studio 2019 projects using **make vs2019**. The +* You can generate Visual Studio 2022 projects using **make vs2022**. The solution and project files will be created in - ``build/projects/windows/mame/vs2019`` by default (the name of the ``build`` + ``build/projects/windows/mame/vs2022`` by default (the name of the ``build`` folder can be changed using the ``BUILDDIR`` option). This will always regenerate the settings, so **REGENIE=1** is *not* needed. * 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 local variables. You currently need to add ``NOWERROR=1`` to the options passed to make when generating the Visual Studio project files. This stops warnings from being treated as errors. (MSVC seems to lack options to control which -specific warnings are treated as error, which other compilers support.) +specific warnings are treated as errors, which other compilers support.) .. _compiling-unusual: diff --git a/hash/apple2_flop_misc.xml b/hash/apple2_flop_misc.xml index b030248391f..f9c002dde32 100644 --- a/hash/apple2_flop_misc.xml +++ b/hash/apple2_flop_misc.xml @@ -50,7 +50,7 @@ Generated by SLIST 0.2.1 - Apple II Diagnostic Disk (version 3.1)(800K 3.5") + Apple II Diagnostic Disk (version 3.1) (800K 3.5") 1991 Apple Computer diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml index 91fd2086870..a47b713254f 100644 --- a/hash/ibm5170_cdrom.xml +++ b/hash/ibm5170_cdrom.xml @@ -8492,7 +8492,7 @@ Installation and Open Circulation CDs are bootable. - Windows NT Server, Enterpise Edition 4.0 (4.0.1381.4) + Windows NT Server, Enterprise Edition 4.0 (4.0.1381.4) 1997 Microsoft $@ + @echo '#define BARE_BUILD_VERSION "0.273"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1588,7 +1588,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.272" > $@ + @echo #define BARE_BUILD_VERSION "0.273" > $@ @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/wing/luckgrln.cpp b/src/mame/wing/luckgrln.cpp index bbe42c42118..40a805d52a6 100644 --- a/src/mame/wing/luckgrln.cpp +++ b/src/mame/wing/luckgrln.cpp @@ -968,6 +968,6 @@ ROM_END **********************************************/ // YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULL NAME FLAGS LAYOUT -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 ) -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 +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 ) +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 GAMEL( 1993, 7smash, 0, _7smash, _7smash, luckgrln_state, empty_init, ROT0, "Sovic", "7 Smash", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_7smash )