mirror of
https://github.com/holub/mame
synced 2025-04-25 17:56:43 +03:00
Merge branch 'release0257' into HEAD
This commit is contained in:
commit
34c30b3ace
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="256"
|
||||
android:versionName="0.256"
|
||||
android:versionCode="257"
|
||||
android:versionName="0.257"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -63,9 +63,9 @@ copyright = u'1997-2023, MAMEdev and contributors'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.256'
|
||||
version = '0.257'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.256'
|
||||
release = '0.257'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -27084,7 +27084,7 @@ license:CC0-1.0
|
||||
</software>
|
||||
|
||||
<software name="sorcererr18k">
|
||||
<description>Sorcerer (Release 18-860904-K)</description>
|
||||
<description>Sorcerer (Release 18 / 860904-K)</description>
|
||||
<year>1986</year>
|
||||
<publisher>Infocom</publisher>
|
||||
<info name="usage" value="Runs on any Apple II with 48K." />
|
||||
|
@ -21454,7 +21454,7 @@ legacy FM implementations cannot find it.
|
||||
</software>
|
||||
|
||||
<software name="minimags">
|
||||
<description>Minimagos</description>
|
||||
<description>MiniMagos</description>
|
||||
<year>2017</year>
|
||||
<publisher><homebrew></publisher>
|
||||
<info name="developer" value="Fran Games"/>
|
||||
|
4
makefile
4
makefile
@ -1561,7 +1561,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.256"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.257"' > $@
|
||||
@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.256" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.257" > $@
|
||||
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
|
||||
@echo extern const char bare_build_version[]; >> $@
|
||||
@echo extern const char bare_vcs_revision[]; >> $@
|
||||
|
Loading…
Reference in New Issue
Block a user