diff options
author | 2021-01-27 00:59:25 +1100 | |
---|---|---|
committer | 2021-01-27 00:59:25 +1100 | |
commit | 4adb09c96986e1cc5ceb2ac4d30eac3457bb62df (patch) | |
tree | 36df4b87ad90d8f62aef04a677df916c4dca0afe | |
parent | 3c499eaeb18965820cf22ccab3476c4768aafc31 (diff) | |
parent | 140f44693319b3b8842c76584822bd63eb36ce1c (diff) |
Merge tag 'mame0228' into mainline-master
MAME 0.228
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index d23fa226f49..52aac8fe83e 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mamedev.mame" - android:versionCode="227" - android:versionName="0.227" + android:versionCode="228" + android:versionName="0.228" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> @@ -1743,14 +1743,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.227"' > $@ + @echo '#define BARE_BUILD_VERSION "0.228"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.227" > $@ + @echo #define BARE_BUILD_VERSION "0.228" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ |