diff options
author | Vas Crabb <vas@vastheman.com> | 2018-09-27 03:09:09 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-09-27 03:09:09 +1000 |
commit | 73a25da76fbfbc0b236b3487973b6246ae490ed6 (patch) | |
tree | ee266dc7893e7919309dac234b6b6fe936a9e96b | |
parent | 0cd1758e544f3f89df226b9861b7201be7fd4b3a (diff) | |
parent | 856478fbda1d7844c1c88ac4bd89e976ec85610f (diff) |
Merge tag 'mame0202'
MAME 0.202
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | hash/c64_flop.xml | 20 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/mame/layout/video21.lay | 4 |
4 files changed, 8 insertions, 24 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 39f7310f1a5..413f1d5e478 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="201" - android:versionName="0.201" + android:versionCode="202" + android:versionName="0.202" android:installLocation="auto"> <!-- Android 5.0 --> diff --git a/hash/c64_flop.xml b/hash/c64_flop.xml index 84b6fc85005..39dd8029187 100644 --- a/hash/c64_flop.xml +++ b/hash/c64_flop.xml @@ -57,7 +57,8 @@ <publisher>Electronic Arts</publisher> <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="174848"> - <rom name="bill_budge.d64" size="174848" crc="d42c40b4" sha1="75b0a166b29e9ed3834c95acc1f263a084062f5f" offset="0" /> + <!-- something special about the last sector --> + <rom name="bill_budge.d64" size="174848" crc="d42c40b4" sha1="75b0a166b29e9ed3834c95acc1f263a084062f5f" offset="0" status="baddump" /> </dataarea> </part> </software> @@ -320,23 +321,6 @@ </part> </software> - <!-- Flippy disks. The other side is for Atari 8-bit. --> - <software name="sargon3"> - <description>Sargon III</description> - <year>1985</year> - <publisher>Hayden Software Company</publisher> - <part name="flop1" interface="floppy_5_25"> - <dataarea name="flop" size="174848"> - <rom name="sargon_iii.d64" size="174848" crc="b18720a1" sha1="4001e2ac78fda39df59508e66c2620d415c15214" offset="0" /> - </dataarea> - </part> - <part name="flop2" interface="floppy_5_25"> - <dataarea name="flop" size="174848"> - <rom name="great_game_and_chess_problems_c64.d64" size="174848" crc="129fa72a" sha1="22e8709081125000b24ea2f3485e19e3af21ed4e" offset="0" /> - </dataarea> - </part> - </software> - <software name="sthassle"> <description>Street Hassle</description> <year>1987</year> @@ -1584,14 +1584,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.201"' > $@ + @echo '#define BARE_BUILD_VERSION "0.202"' > $@ @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: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.201" > $@ + @echo #define BARE_BUILD_VERSION "0.202" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/src/mame/layout/video21.lay b/src/mame/layout/video21.lay index 31d13761e30..8a83cdecbca 100644 --- a/src/mame/layout/video21.lay +++ b/src/mame/layout/video21.lay @@ -1,7 +1,7 @@ <?xml version="1.0"?> <mamelayout version="2"> -<!-- define elements --> + <!-- define elements --> <element name="overlay"> <rect> @@ -101,7 +101,7 @@ </element> -<!-- build screen --> + <!-- build screen --> <view name="Internal Layout"> <screen index="0"> |