summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-02-02 14:16:28 +1100
committer Vas Crabb <vas@vastheman.com>2020-02-02 14:16:28 +1100
commite15251ffb8e5b13d02af575d208ab0d460eec722 (patch)
treea846ee75f7e4ef3bec4e273a27f7796ba81ebb6b
parent4c7e687f5e9d1edef8419aecaa6f936a604f54c6 (diff)
parent0e2a252d309ec983896184c21864ac31769f6697 (diff)
Merge tag 'mame0218'
MAME 0.218
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--makefile4
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 -->
diff --git a/makefile b/makefile
index f3e3810f437..ef418de792d 100644
--- a/makefile
+++ b/makefile
@@ -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; >> $@