mirror of
https://github.com/holub/mame
synced 2025-06-07 13:23:50 +03:00
Bump version to 0.253
This commit is contained in:
parent
664f210775
commit
b6d9756c5e
@ -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
4
makefile
@ -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[]; >> $@
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user