diff options
author | 2020-02-02 14:16:28 +1100 | |
---|---|---|
committer | 2020-02-02 14:16:28 +1100 | |
commit | e15251ffb8e5b13d02af575d208ab0d460eec722 (patch) | |
tree | a846ee75f7e4ef3bec4e273a27f7796ba81ebb6b | |
parent | 4c7e687f5e9d1edef8419aecaa6f936a604f54c6 (diff) | |
parent | 0e2a252d309ec983896184c21864ac31769f6697 (diff) |
Merge tag 'mame0218'
MAME 0.218
-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 6bd4a141cec..a9bc73b9e6c 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="217" - android:versionName="0.217" + android:versionCode="218" + android:versionName="0.218" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> @@ -1699,14 +1699,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.217"' > $@ + @echo '#define BARE_BUILD_VERSION "0.218"' > $@ @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.217" > $@ + @echo #define BARE_BUILD_VERSION "0.218" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ |