Merge tag 'mame0248' into rel248

MAME 0.248
mahlemiut · Sep 27, 2022 · d8b5ffb · d8b5ffb
2 parents 7f96dcb + 2d3d0de
commit d8b5ffb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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="247"
-      android:versionName="0.247"
+      android:versionCode="248"
+      android:versionName="0.248"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # 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/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 <mame-commandline-nomouse>`,
 :ref:`lightgun <mame-commandline-nolightgun>` and :ref:`joystick
 <mame-commandline-nojoystick>` options.  You can reach the Input Devices menu by
-selecting **Input Devices** from the :ref:`main menu <menus-main>` or the
-General Settings menu.
+selecting **Input Devices** from the :ref:`Input Settings menu
+<menus-inputopts>` 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

diff --git 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 "W (" 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[]; >> $@

diff --git 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)");