From ded96a0f4e4b819681154db2de3dda6959a54a4d Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 23 Dec 2024 03:52:05 +1100 Subject: [PATCH 1/4] docs: Updated compiling instructions to refer to Visual Studio 2022, bumped version to 0.273. --- docs/source/conf.py | 4 ++-- docs/source/initialsetup/compilingmame.rst | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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: From 4e998fda386fbaa737d4f90942ff35deef54ef97 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 22 Dec 2024 22:37:37 +0100 Subject: [PATCH 2/4] yakyuken: correct ay and irq frequency --- src/mame/omori/yakyuken.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mame/omori/yakyuken.cpp b/src/mame/omori/yakyuken.cpp index a252163c8cf..d26c645159a 100644 --- a/src/mame/omori/yakyuken.cpp +++ b/src/mame/omori/yakyuken.cpp @@ -32,8 +32,6 @@ TODO: - game sometimes leaves gaps when the lady is undressing - colors aren't 100% correct (see i.e. the stripes in the curtains), reference video: https://www.youtube.com/watch?v=zTOFIhuwR2w -- verify sound pitch (unfortunately, no pcb sound in above video) -- verify irq frequency, though it looks similar to the pcb video */ @@ -276,9 +274,7 @@ void yakyuken_state::yakyuken(machine_config &config) Z80(config, m_maincpu, 18.432_MHz_XTAL / 3 / 2); // 3.072 MHz m_maincpu->set_addrmap(AS_PROGRAM, &yakyuken_state::main_program_map); m_maincpu->set_addrmap(AS_IO, &yakyuken_state::main_io_map); - - attotime irq_period = attotime::from_ticks(0x2000, 18.432_MHz_XTAL / 3); - m_maincpu->set_periodic_int(FUNC(yakyuken_state::irq0_line_hold), irq_period); + m_maincpu->set_periodic_int(FUNC(yakyuken_state::irq0_line_hold), attotime::from_hz(4*60)); Z80(config, m_audiocpu, 18.432_MHz_XTAL / 3 / 4); // 1.536 MHz m_audiocpu->set_addrmap(AS_PROGRAM, &yakyuken_state::sound_program_map); @@ -304,7 +300,8 @@ void yakyuken_state::yakyuken(machine_config &config) GENERIC_LATCH_8(config, "soundlatch"); - AY8910(config, m_ay, 18.432_MHz_XTAL / 3 / 16).add_route(ALL_OUTPUTS, "mono", 0.35); + AY8910(config, m_ay, 18.432_MHz_XTAL / 3 / 4); // 1.536 MHz + m_ay->add_route(ALL_OUTPUTS, "mono", 0.35); } From e9b194d1c57c5f7de6463c8d4d54b8293fab0635 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 30 Dec 2024 07:34:27 +1100 Subject: [PATCH 3/4] Corrected some metadata. --- hash/apple2_flop_misc.xml | 2 +- hash/ibm5170_cdrom.xml | 2 +- src/mame/wing/luckgrln.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 63870ca2802..d5fd13a59b1 100644 --- a/hash/ibm5170_cdrom.xml +++ b/hash/ibm5170_cdrom.xml @@ -8038,7 +8038,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 Date: Mon, 30 Dec 2024 07:41:08 +1100 Subject: [PATCH 4/4] Bumped version to 0.273. --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/makefile b/makefile index bc8710dcfe5..baad79bedba 100644 --- a/makefile +++ b/makefile @@ -1578,7 +1578,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(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[];' >> $@ @@ -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[]; >> $@