Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 02:07:14 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge tag 'mame0202'

Browse Source 
MAME 0.202
This commit is contained in:
Vas Crabb 2018-09-27 03:09:09 +10:00
commit 73a25da76f
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -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 -->

20
hash/c64_flop.xml
View File

@ -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>

4
makefile
View File

@ -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; >> $@

4
src/mame/layout/video21.lay
View File

@ -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">