mirror of
https://github.com/holub/mame
synced 2025-04-24 17:30:55 +03:00
Merge tag 'mame0207'
MAME 0.207
This commit is contained in:
commit
4317ca1f27
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="206"
|
||||
android:versionName="0.206"
|
||||
android:versionCode="207"
|
||||
android:versionName="0.207"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -130,7 +130,7 @@
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="lotus123">
|
||||
<software name="lotus123" supported="no">
|
||||
<description>Lotus 123 (Release 1A)</description>
|
||||
<year>1985</year>
|
||||
<publisher>Lotus Development Corporation</publisher>
|
||||
@ -177,7 +177,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.10 / Release 3.1.1 -->
|
||||
<software name="msd">
|
||||
<software name="msd" supported="no">
|
||||
<description>MSD 2.7.0 (Winchester Test)</description>
|
||||
<year>1986</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -189,7 +189,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.10 / Release 3.1.1 -->
|
||||
<software name="netf13">
|
||||
<software name="netf13" supported="no">
|
||||
<description>apricot Networks VR1.3 F-Series</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -226,7 +226,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.10 / Beta 3.1 -->
|
||||
<software name="netf13b">
|
||||
<software name="netf13b" supported="no">
|
||||
<description>apricot Networks VB1.3 F-Series (Beta Release)</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -263,7 +263,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 2.11 / BIOS VR2.4 -->
|
||||
<software name="netdiag">
|
||||
<software name="netdiag" supported="no">
|
||||
<description>POINT 32 Network Diagnostics</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -292,7 +292,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.10 / Release 3.1.1 -->
|
||||
<software name="netxi13">
|
||||
<software name="netxi13" supported="no">
|
||||
<description>apricot Networks VR1.3 PC/Xi</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -329,7 +329,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.10 / Beta 3.1 -->
|
||||
<software name="netxi13b">
|
||||
<software name="netxi13b" supported="no">
|
||||
<description>apricot Networks VB1.3 PC/Xi (Beta Release)</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -366,7 +366,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.06 / Version R2.6 -->
|
||||
<software name="point32_11">
|
||||
<software name="point32_11" supported="no">
|
||||
<description>POINT 32 VR1.1</description>
|
||||
<year>1984</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -397,7 +397,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.10 / Release 2.7 -->
|
||||
<software name="point32_12">
|
||||
<software name="point32_12" supported="no">
|
||||
<description>POINT 32 VR1.2</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -434,7 +434,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 3.10 / Release 2.7 -->
|
||||
<software name="point32_12b">
|
||||
<software name="point32_12b" supported="no">
|
||||
<description>POINT 32 VB1.2 (Beta Release)</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -544,7 +544,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 2.11 / Release 2.7 -->
|
||||
<software name="winformat">
|
||||
<software name="winformat" supported="no">
|
||||
<description>Winchester Factory Formatter 2.1 (TES004)</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -556,7 +556,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 2.11 / Release 2.7 -->
|
||||
<software name="wintest">
|
||||
<software name="wintest" supported="no">
|
||||
<description>Winchester Data Integrity Test 4.0 (TES002)</description>
|
||||
<year>1985</year>
|
||||
<publisher>ACT</publisher>
|
||||
@ -568,7 +568,7 @@
|
||||
</software>
|
||||
|
||||
<!-- MS-DOS 2.11 / BIOS VE2.0 -->
|
||||
<software name="wincheck">
|
||||
<software name="wincheck" supported="no">
|
||||
<description>Winchester Data Integrity Check 1.1</description>
|
||||
<year>1984</year>
|
||||
<publisher>ACT</publisher>
|
||||
|
@ -149,7 +149,7 @@
|
||||
74 *EC0074-JPM J-Pop Mix Volume 37
|
||||
75 *EC0075-JPM J-Pop Mix Volume 38
|
||||
76 *EC0076-JPM J-Pop Mix Volume 39
|
||||
77 *EC0077-ATS Artist Selection Volume 15 - unknown artist (should be Vol 15? sales sheet lists 5?)
|
||||
77 *EC0077-ATS Artist Selection Volume 15 - Keisuke Kuwata (should be Vol 15? sales sheet lists 5?)
|
||||
78 *EC0078-JPM J-Pop Mix Volume 40
|
||||
79 *EC0079-ETZ ETZ 2 (custom presentation etc.)
|
||||
80 *EC0080-JPM J-Pop Mix Volume 41
|
||||
@ -1014,7 +1014,7 @@
|
||||
</software>
|
||||
|
||||
<software name="ec0077">
|
||||
<description>Artist Selection Volume 15 - unknown artist (Japan) (EC0077-ATS)</description>
|
||||
<description>Artist Selection Volume 15 - Keisuke Kuwata (Japan) (EC0077-ATS)</description>
|
||||
<year>2001</year>
|
||||
<publisher>Takara</publisher>
|
||||
<part name="cart" interface="ekara_cart">
|
||||
|
@ -18,13 +18,13 @@
|
||||
G-5 GC0005-TPJ TV Pop Volume 1
|
||||
G-6 *GC0006-BHT BHT Volume 3 (Best Artists?)
|
||||
G-7 *GC0007-BAT BAT Volume 3 (Artist Selection?)
|
||||
G-8 *GC0008-MIN? untranslated (no volume)
|
||||
G-8 *GC0008-MIN mini-moni Volume 1
|
||||
G-9 GC0009-TPJ TV Pop Volume 3 (Volume 2 is 'P-2' in 'P' series)
|
||||
G-10 *GC0010-BAT BAT Volume 4 (Artist Selection?)
|
||||
G-11 GC0011-TPJ TV Pop Volume 4
|
||||
G-12 GC0012-BHT BHT Volume 5 (Best Artists?) (Volume 4 is 'P-1' in 'P' series)
|
||||
G-13 GC0013- (unknown) Volume 6
|
||||
G-14 *GC0014-MIN? (unknown) Volume 2
|
||||
G-14 *GC0014-MIN mini-moni Volume 2
|
||||
G-15 *GC0015-BAT BAT Volume 5 (Artist Selection?)
|
||||
G-16 *GC0016-TPJ TV Pop Volume 5
|
||||
G-17 *GC0017-TPJ TV Pop Volume 6
|
||||
@ -101,7 +101,7 @@
|
||||
</software>
|
||||
|
||||
<software name="gc0008">
|
||||
<description>Mini Moni Volume 1 (Japan) (GC0008-MIN) (set 1)</description>
|
||||
<description>mini-moni Volume 1 (Japan) (GC0008-MIN) (set 1)</description>
|
||||
<year>2001</year>
|
||||
<publisher>Takara</publisher>
|
||||
<part name="cart" interface="ekara_cart">
|
||||
@ -112,7 +112,7 @@
|
||||
</software>
|
||||
|
||||
<software name="gc0008a" cloneof="gc0008">
|
||||
<description>MIN Volume 1 (Japan) (GC0008-MIN) (set 2)</description>
|
||||
<description>mini-moni Volume 1 (Japan) (GC0008-MIN) (set 2)</description>
|
||||
<year>2001</year>
|
||||
<publisher>Takara</publisher>
|
||||
<part name="cart" interface="ekara_cart">
|
||||
@ -148,7 +148,7 @@
|
||||
|
||||
|
||||
<software name="gc0014">
|
||||
<description>Mini Moni Volume 2 (GC0014-MIN)</description>
|
||||
<description>mini-moni Volume 2 (GC0014-MIN)</description>
|
||||
<year>2002</year>
|
||||
<publisher>Takara</publisher>
|
||||
<part name="cart" interface="ekara_cart">
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
S-1 SC0001- Hello Kitty Special
|
||||
S-2 SC0002-SAI SAI (series 3) Volume 1
|
||||
S-3 *SC0003- unknown(1) Volume 1
|
||||
S-3 *SC0003- Kids' Challenge Volume 1
|
||||
S-4 *SC0004-SAI SAI (series 1) Volume 1
|
||||
S-5 *SC0005-SAI SAI (series 2) Volume 1 (same series as 6,9,19,21,22)
|
||||
S-6 *SC0006-SAI SAI (series 2) Volume 2 (same series as 5,9,19,21,22)
|
||||
@ -27,7 +27,7 @@
|
||||
S-15 SC0015- unknown(2) Volume 2
|
||||
S-16 SC0016-SAI SAI (series 2) Volume 5
|
||||
S-17 SC0017- unknown(1) Volume 2
|
||||
S-18 *SC0018-SAI (unknown) Volume 1
|
||||
S-18 *SC0018-SAI Challenge Artist Volume 1
|
||||
S-19 *SC0019-SAI SAI (series 2) Volume 6 (same series as 5,6,9,21,22)
|
||||
S-20 SC0020- SAI (series 3) Volume 5
|
||||
S-21 *SC0021-SAI SAI (series 2) Volume 7 (same series as 5,6,9,19,22)
|
||||
@ -41,7 +41,7 @@
|
||||
<!-- these have unique presentation -->
|
||||
|
||||
<software name="sc0003">
|
||||
<description>unknown(1) Volume 1 (Japan) (SC0003-xxx)</description>
|
||||
<description>Kids' Challenge Volume 1 (Japan) (SC0003-xxx)</description>
|
||||
<year>2001</year>
|
||||
<publisher>Takara</publisher>
|
||||
<part name="cart" interface="ekara_cart">
|
||||
@ -118,7 +118,7 @@
|
||||
</software>
|
||||
|
||||
<software name="sc0018">
|
||||
<description>(unknown) Volume 1 (SC0018-SAI)</description>
|
||||
<description>Challenge Artist Volume 1 (Japan) (SC0018-SAI)</description>
|
||||
<year>2002</year>
|
||||
<publisher>Takara</publisher>
|
||||
<part name="cart" interface="ekara_cart">
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
-->
|
||||
|
||||
<software name="jp01">
|
||||
<software name="jp01" supported="no">
|
||||
<description>JP-01 (Japan)</description>
|
||||
<year>2004</year>
|
||||
<publisher>Takara</publisher>
|
||||
@ -30,7 +30,7 @@
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="jp02">
|
||||
<software name="jp02" supported="no">
|
||||
<description>JP-02 (Japan)</description>
|
||||
<year>2004</year>
|
||||
<publisher>Takara</publisher>
|
||||
|
4
makefile
4
makefile
@ -1625,14 +1625,14 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.206"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.207"' > $@
|
||||
@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.206" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.207" > $@
|
||||
@echo extern const char bare_build_version[]; >> $@
|
||||
@echo extern const char build_version[]; >> $@
|
||||
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
|
||||
|
Loading…
Reference in New Issue
Block a user