From bd7870abe6cc276c496e9709b39285579162fc10 Mon Sep 17 00:00:00 2001 From: invertego Date: Sun, 25 Sep 2022 13:51:21 -0700 Subject: diagnostics: fix clang Windows build (#10370) Restore necessary const qualifier removed by 0055a33e81b60284c6390e9c73db9fcb19b8ce8b --- src/osd/modules/diagnostics/diagnostics_win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp index 4609673c66a..5b82b63f2c3 100644 --- a/src/osd/modules/diagnostics/diagnostics_win32.cpp +++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp @@ -507,7 +507,7 @@ bool symbol_manager::parse_sym_line(const char *line, uintptr_t &address, std::s */ // first look for a (ty) entry - char *type = strstr(line, "(ty 20)"); + const char *type = strstr(line, "(ty 20)"); if (type == nullptr) type = strstr(line, "(ty 20)"); -- cgit v1.2.3 From a4b61abc252effb57181ce081fa8513c7b75b022 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 26 Sep 2022 17:09:57 +1000 Subject: docs: Corrected parent menu for input devices menu. --- docs/source/usingmame/mamemenus.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/usingmame/mamemenus.rst b/docs/source/usingmame/mamemenus.rst index 819965f4964..a7010a082fe 100644 --- a/docs/source/usingmame/mamemenus.rst +++ b/docs/source/usingmame/mamemenus.rst @@ -267,8 +267,8 @@ your current settings. Recognised input devices depend on the enabled or disabled using the :ref:`mouse `, :ref:`lightgun ` and :ref:`joystick ` options. You can reach the Input Devices menu by -selecting **Input Devices** from the :ref:`main menu ` or the -General Settings menu. +selecting **Input Devices** from the :ref:`Input Settings menu +` or the General Settings menu. Input devices are grouped by device class (for example keyboards or light guns). You can move between device classes using the **Next Group** and **Previous -- cgit v1.2.3 From 2d3d0deec8fa4025ea51c1722a21e6b9a7a8bb92 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 26 Sep 2022 17:10:36 +1000 Subject: Bump version to 0.248 --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- docs/source/conf.py | 4 ++-- makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 16879df99a7..ea6f70ec235 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 a90bc66c54f..61f16eb555b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2022, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.247' +version = '0.248' # The full version, including alpha/beta/rc tags. -release = '0.247' +release = '0.248' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/makefile b/makefile index 02f1375c849..67f824a9fcc 100644 --- a/makefile +++ b/makefile @@ -1579,7 +1579,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.247"' > $@ + @echo '#define BARE_BUILD_VERSION "0.248"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1589,7 +1589,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.247" > $@ + @echo #define BARE_BUILD_VERSION "0.248" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ -- cgit v1.2.3