summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2023-03-30 01:05:56 +1100
committer Vas Crabb <vas@vastheman.com>2023-03-30 01:05:56 +1100
commitb6d9756c5e0c4d01cf034c38f95b0de64145f214 (patch)
tree87e307c0835b1ea9358f00950a465c4e8f78bf30
parent664f2107750db3d5740149fed8e4d2db49fce65b (diff)
Bump version to 0.253mame0253
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--makefile4
-rw-r--r--src/osd/modules/input/input_dinput.h4
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 c4cd2075bd3..323f4cec484 100644
--- 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="252"
- android:versionName="0.252"
+ android:versionCode="253"
+ android:versionName="0.253"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->
diff --git a/makefile b/makefile
index 9e58548ad15..8deb9cc19d6 100644
--- a/makefile
+++ b/makefile
@@ -1561,7 +1561,7 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.252"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.253"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1571,7 +1571,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.252" > $@
+ @echo #define BARE_BUILD_VERSION "0.253" > $@
@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/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
index b7fc942aaec..98fdfb011bb 100644
--- a/src/osd/modules/input/input_dinput.h
+++ b/src/osd/modules/input/input_dinput.h
@@ -90,7 +90,7 @@ public:
{
return m_dinput->EnumDevices(
devclass,
- &di_emun_devices_cb<std::remove_reference_t<T> >,
+ &di_enum_devices_cb<std::remove_reference_t<T> >,
LPVOID(&callback),
DIEDFL_ATTACHEDONLY);
}
@@ -123,7 +123,7 @@ private:
static std::string make_id(LPCDIDEVICEINSTANCE instance);
template <typename T>
- static BOOL CALLBACK di_emun_devices_cb(LPCDIDEVICEINSTANCE instance, LPVOID ref)
+ static BOOL CALLBACK di_enum_devices_cb(LPCDIDEVICEINSTANCE instance, LPVOID ref)
{
return (*reinterpret_cast<T *>(ref))(instance);
}