mirror of
https://github.com/holub/mame
synced 2025-06-30 16:00:01 +03:00
MAME 0.251
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmOtokcACgkQwXSxAYxA cQ5pEBAAzd+1xTcQ7LR3BDw8pAMOsIHeKJJM+lnKgfv+KfJYuMp3MuJ5uyBNyhW2 cUdpg1fSHHFSRcpQKF2d8NiEkThTuTuGVns4AHbciIkohORRnh7Yen3LZAtheAuh 9mGfXrMTBZvlx7gLDGEVXCpRstRHGpx6kaZSzri+Jlw+TjhIz+aEg59sb+6HyKCO 9vJExZCqVnZLGuNU98nkQKEJ0MLJFoWrojKXUb0mD17a3jZfpCCXv/dyWjVgic/s SbX8NiTdrQp9Yi3WbKbepfp7Ck2DvnJPObH0Zf1ZXgxs3+DWD/ku3WNP2IwIEAF7 /YzBkyDhkzKJVMBFO4jNCTQ61JeplsaLj4I6vLEN8/fHcs/zUOwp/BkrHpEBx0yv OKxsL2Pjno7Mqxj/EnLI7QM8nCnOZxzuHrdosHsn6RdJAhaoRaYh2hz/WMiz5BVS e2Uecu2Ake/1pEKfdHBOKBaWQODA68/nUnhQpNKby40UEcTYalriQ1Iah6cYsWpj dYbLA1Ccs7FBNl+BNQgLVuhoVsVdtdmNagbdim9nC25zVz+drrj9zmyHIFQx8rGR IKI70XXOWR/i4ZDETArwyuQN1hMittkU/WAsRVkoOJ4+38mkZclfwGwRfR6nk2vZ jSw3r232opbNP8o+WLDyfe9oSeiZvc7oc8+nTD2V8fr65LzKst4= =DxER -----END PGP SIGNATURE----- Merge tag 'mame0251' into mainline-master MAME 0.251
This commit is contained in:
commit
c924e869a0
@ -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="250"
|
android:versionCode="251"
|
||||||
android:versionName="0.250"
|
android:versionName="0.251"
|
||||||
android:installLocation="auto">
|
android:installLocation="auto">
|
||||||
|
|
||||||
<!-- OpenGL ES 2.0 -->
|
<!-- OpenGL ES 2.0 -->
|
||||||
|
@ -63,9 +63,9 @@ copyright = u'1997-2022, MAMEdev and contributors'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = '0.250'
|
version = '0.251'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = '0.250'
|
release = '0.251'
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
4
makefile
4
makefile
@ -1579,7 +1579,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.250"' > $@
|
@echo '#define BARE_BUILD_VERSION "0.251"' > $@
|
||||||
@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[];' >> $@
|
||||||
@ -1589,7 +1589,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.250" > $@
|
@echo #define BARE_BUILD_VERSION "0.251" > $@
|
||||||
@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[]; >> $@
|
||||||
|
Loading…
Reference in New Issue
Block a user