mirror of
https://github.com/holub/mame
synced 2025-04-23 00:39:36 +03:00
MAME 0.246
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmLlDXQACgkQwXSxAYxA cQ4pkQ//cyJUbstoARgTNnMDbY/f4hfV/dzhvlDzylnxQ8q9Zf9mCJIDuMZgvNJb HtjsUu0XKTjutc/IrjJ2Ug9EfQSXbEy7ijAVh2JG3pOqDkT7J/OTDNv8TM6SUjuN ruFy+Gu9G2jJ+uGWXlFNlS14oJiy2h2Za/NGAyciLdvzLd0rG83EyGrviO/sTutJ lCa6FhRto5rG4H8RdKqqlzr2I1tu0ccFlBFLlATgS1PwVPs2D7CkK1jZBOMWtTbZ hYAzUo7iJeFWwEuC/P59crG0D26yGkML2X7CVZbwVoqCM89AnJEUXycfhRYuJEfv ZCUQm/ZjXInc0ZQ5J5lfAxdepx1djRWZosNy0vNolAgtpmgtgTB+V9kuiZtRoB/z cf3OBbBKZmxEmMZ5YMGf2ifGc50vruPzYL1hdtjc6nxw+XWH6gLd3NUsQghzl0x8 SeASD/pWI3eIis/2ZBmSINZj12vEuJTHYWGS+6YO050bRcv1zapglKtngFIcjUq7 ROESTOsy9bhoB1RPFwNgUGTgfDF5/8++Qm5BpUtIJj1Oq8fKlX+RDEA6fscUXYBN CJtSlk5+3+wiQNUxRjkct/877Ld64wSxDA6qGdejE80lk561igxtGgOHPqUJuw5C 2NO191vwqJl47fKww4HD3FOIOuyXXUbszOOhk6xmcmigizfgJn8= =P+4E -----END PGP SIGNATURE----- Merge tag 'mame0246' into mainline-master MAME 0.246
This commit is contained in:
commit
a0b8c86c60
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="245"
|
||||
android:versionName="0.245"
|
||||
android:versionCode="246"
|
||||
android:versionName="0.246"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
4
makefile
4
makefile
@ -1569,7 +1569,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.245"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.246"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
@ -1579,7 +1579,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.245" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.246" > $@
|
||||
@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