Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 00:09:18 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

MAME 0.253

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmQkRf0ACgkQwXSxAYxA
 cQ5+0w//ZXVZKDHsDCYFDzI8vusB8XUtzp0eij6OFmw21G/7P0VSBwT2yOYt+M6Q
 WIpFXTRQLsRayK+Z/nwTBYhp8Qa+p5K/aaVnrYezYhn780DPnQ+9It3IxlW4t+P4
 JcaRQLl9TsNlOqrOrJ1z9B49Exa2f1IQ/ZueoQj6APKUXtMLLcBtTlhUr8dJo+fc
 OR92tG9ACkuQoZl24AS5IT1ce8fN//SdH0mxN0HekH4NTGFFU65xBsWtpd8yLeNS
 W3rod8lU98j/z76lEGWUuGtBBlJGfFhw5JnyE51oNJstbGj5QaQWcy9OkmY7gBYE
 pr7uf+wSAdw9XG8CClbeM3t5SSSm8DGKv11SOpSYwIE9Jj/OJ+R37KX8JGA1FEh8
 nqGGD2EooqR+TjHWyrzSdModusqfimyMqHxKwClqhbDmEwOZcsQ67tk2vUv20fO8
 LDurJHodxpgtoeeD4JxwmbC2/T/DOeXALnV+ZAZj/vairlQ+s6CwfLwFRMRdbShC
 AlqWENYhPrWuqg81SFCNqW6QbQl3C4g4pnaR2ReHsPc9BCNKRQxno8rN//XJYYKf
 FTSNw+t13rImiXzuQMVJzzgOwFO5pIjIxKsHHFtzQqYvRKTl+6LlLm8UMj5jfC3I
 hTDqZr2yNIA+lEmvI0giwfs8I3m7conHKMAIuqFrx6xtvArI9aI=
 =q1to
 -----END PGP SIGNATURE-----

Merge tag 'mame0253' into mainline-master

MAME 0.253
This commit is contained in:
Vas Crabb 2023-03-30 15:45:54 +11:00
commit 2540d162a8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame" package="org.mamedev.mame"
android:versionCode="252" android:versionCode="253"
android:versionName="0.252" android:versionName="0.253"
android:installLocation="auto"> android:installLocation="auto">
<!-- OpenGL ES 2.0 --> <!-- OpenGL ES 2.0 -->

4
makefile
View File

@ -1561,7 +1561,7 @@ endif
ifeq (posix,$(SHELLTYPE)) ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) $(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 '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@ @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 ")";' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
else else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) $(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 #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@

4
src/osd/modules/input/input_dinput.h
View File

@ -90,7 +90,7 @@ public:
{ {
return m_dinput->EnumDevices( return m_dinput->EnumDevices(
devclass, devclass,
&di_emun_devices_cb<std::remove_reference_t<T> >, &di_enum_devices_cb<std::remove_reference_t<T> >,
LPVOID(&callback), LPVOID(&callback),
DIEDFL_ATTACHEDONLY); DIEDFL_ATTACHEDONLY);
} }
@ -123,7 +123,7 @@ private:
static std::string make_id(LPCDIDEVICEINSTANCE instance); static std::string make_id(LPCDIDEVICEINSTANCE instance);
template <typename T> 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); return (*reinterpret_cast<T *>(ref))(instance);
} }