mirror of
https://github.com/holub/mame
synced 2025-04-19 23:12:11 +03:00
MAME 0.267
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmZ9gRQACgkQwXSxAYxA cQ6SMRAApLl+7knm4O/N1WgwJ9RhDRGGYtgZ3yUMae6JBsD/OiyzJAv0f/p8yTh1 VoW0Vk+r6wP4ItqlspOuSg9GQbekiolhnlYaFfGtjocnMqMRPRDngqQIZcLBDi1n UsGAXA2AhAyJr2Qfa81iXcRzCAchwachfWFbnhkNy78u5EYjP/JB2ggdtU63kbYF aTesUzcSUypICITncAOuCQzZuzHzEgXh2MWvZ+xh/kjkd4KSoqGLbQ1+RsW/A2vy UZ+igLAndQQ4RSSXdCLwM3QK+4I3W78+uJDeflj8yAg9ItE6nH/1rK628ujjCHra l2jt/8izCNZjEpaBCNqHcCA4X9fYEp8SZEv+V59F6mNNtlwzrRI+0iVE/kpOgfgE s09ggRRmJac8jn1N/W1vhJX+j3Akf6yjLZ7OAScKPCf3ZDHE4cMI1cwI/+qzIZb7 ZDjrD8/wOAkoYLT2JdyQiNpqyFdz/ZEo6mA8s86eOWozDVXLubHK1rdHen/ib9eg 5CDn7AIeoTcFfQz2dBmC/KPZh+ths3eEcfGD23NN4+VRdmGAe8dvS7L/FB4lff4O sQtZLh0BC1Mb9B5+tW8/YgIHhLasWJxlnIfiBDn3PDlZ9V2hynRYtwaO/Qivw00a zJRmd5opWvSc7TWY166qTJTOQX12UOL14ofVUsbytB6GvrTe6jE= =IVD2 -----END PGP SIGNATURE----- Merge tag 'mame0267' into HEAD MAME 0.267
This commit is contained in:
commit
9abb39b644
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="266"
|
||||
android:versionName="0.266"
|
||||
android:versionCode="267"
|
||||
android:versionName="0.267"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -63,9 +63,9 @@ copyright = u'1997-2024, MAMEdev and contributors'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.266'
|
||||
version = '0.267'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.266'
|
||||
release = '0.267'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -54,10 +54,10 @@ Extra: Nihon kaitaku no tabi Game (日本かいたくの旅ゲーム)
|
||||
<softwarelist name="challenge_gear_cart" description="Benesse Challenge Gear cartridges">
|
||||
|
||||
<software name="6grade" supported="no">
|
||||
<description>6th Grade: Dance Battle</description>
|
||||
<description>Challenge 6-nensei</description>
|
||||
<year>2003</year>
|
||||
<publisher>Benesse Corporation</publisher>
|
||||
<info name="alt_title" value="ダンスバトル" />
|
||||
<info name="alt_title" value="チャレンジ6年生" />
|
||||
<part name="cart" interface="challenge_gear_cart">
|
||||
<dataarea name="rom" size="0x80000">
|
||||
<rom name="MS040601.ic1" size="0x80000" crc="487ecb9c" sha1="bc89468aff7f06f1694eed17f15cab46c0d1638e" />
|
||||
|
@ -5826,7 +5826,7 @@ license:CC0-1.0
|
||||
|
||||
<!-- NetBSD -->
|
||||
|
||||
<software name="netbsd_1_6_2">
|
||||
<software name="netbsd_1_6_2" supported="no">
|
||||
<description>NetBSD 1.6.2</description>
|
||||
<year>2004</year> <!-- 10/04 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5846,7 +5846,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_2_0" cloneof="netbsd_2_0_2">
|
||||
<software name="netbsd_2_0" cloneof="netbsd_2_0_2" supported="no">
|
||||
<description>NetBSD 2.0</description>
|
||||
<year>2004</year> <!-- 12/04 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5866,7 +5866,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_2_0_2">
|
||||
<software name="netbsd_2_0_2" supported="no">
|
||||
<description>NetBSD 2.0.2</description>
|
||||
<year>2005</year> <!-- 04/05 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5886,7 +5886,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_2_1">
|
||||
<software name="netbsd_2_1" supported="no">
|
||||
<description>NetBSD 2.1</description>
|
||||
<year>2005</year> <!-- 10/04 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5906,7 +5906,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_3_0" cloneof="netbsd_3_0_2">
|
||||
<software name="netbsd_3_0" cloneof="netbsd_3_0_2" supported="no">
|
||||
<description>NetBSD 3.0</description>
|
||||
<year>2005</year> <!-- 12/05 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5926,7 +5926,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_3_0_1" cloneof="netbsd_3_0_2">
|
||||
<software name="netbsd_3_0_1" cloneof="netbsd_3_0_2" supported="no">
|
||||
<description>NetBSD 3.0.1</description>
|
||||
<year>2006</year> <!-- 07/06 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5946,7 +5946,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_3_0_2">
|
||||
<software name="netbsd_3_0_2" supported="no">
|
||||
<description>NetBSD 3.0.2</description>
|
||||
<year>2006</year> <!-- 11/06 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5966,7 +5966,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_3_1">
|
||||
<software name="netbsd_3_1" supported="no">
|
||||
<description>NetBSD 3.1</description>
|
||||
<year>2006</year> <!-- 11/06 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -5986,7 +5986,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_4_0" cloneof="netbsd_4_0_1">
|
||||
<software name="netbsd_4_0" cloneof="netbsd_4_0_1" supported="no">
|
||||
<description>NetBSD 4.0</description>
|
||||
<year>2007</year> <!-- 12/07 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6006,7 +6006,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_4_0_1">
|
||||
<software name="netbsd_4_0_1" supported="no">
|
||||
<description>NetBSD 4.0.1</description>
|
||||
<year>2008</year> <!-- 10/08 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6026,7 +6026,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_0" cloneof="netbsd_5_0_2">
|
||||
<software name="netbsd_5_0" cloneof="netbsd_5_0_2" supported="no">
|
||||
<description>NetBSD 5.0</description>
|
||||
<year>2009</year> <!-- 04/09 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6046,7 +6046,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_0_1" cloneof="netbsd_5_0_2">
|
||||
<software name="netbsd_5_0_1" cloneof="netbsd_5_0_2" supported="no">
|
||||
<description>NetBSD 5.0.1</description>
|
||||
<year>2009</year> <!-- 07/09 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6066,7 +6066,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_0_2">
|
||||
<software name="netbsd_5_0_2" supported="no">
|
||||
<description>NetBSD 5.0.2</description>
|
||||
<year>2010</year> <!-- 02/10 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6086,7 +6086,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_1" cloneof="netbsd_5_1_5">
|
||||
<software name="netbsd_5_1" cloneof="netbsd_5_1_5" supported="no">
|
||||
<description>NetBSD 5.1</description>
|
||||
<year>2010</year> <!-- 11/10 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6106,7 +6106,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_1_1" cloneof="netbsd_5_1_5">
|
||||
<software name="netbsd_5_1_1" cloneof="netbsd_5_1_5" supported="no">
|
||||
<description>NetBSD 5.1.1</description>
|
||||
<year>2012</year> <!-- 01/12 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6126,7 +6126,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_1_2" cloneof="netbsd_5_1_5">
|
||||
<software name="netbsd_5_1_2" cloneof="netbsd_5_1_5" supported="no">
|
||||
<description>NetBSD 5.1.2</description>
|
||||
<year>2012</year> <!-- 02/12 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6146,7 +6146,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_1_3" cloneof="netbsd_5_1_5">
|
||||
<software name="netbsd_5_1_3" cloneof="netbsd_5_1_5" supported="no">
|
||||
<description>NetBSD 5.1.3</description>
|
||||
<year>2013</year> <!-- 09/13 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6166,7 +6166,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_1_4" cloneof="netbsd_5_1_5">
|
||||
<software name="netbsd_5_1_4" cloneof="netbsd_5_1_5" supported="no">
|
||||
<description>NetBSD 5.1.4</description>
|
||||
<year>2014</year> <!-- 01/14 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6186,7 +6186,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_1_5">
|
||||
<software name="netbsd_5_1_5" supported="no">
|
||||
<description>NetBSD 5.1.5</description>
|
||||
<year>2014</year> <!-- 11/14 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6206,7 +6206,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_2" cloneof="netbsd_5_2_3">
|
||||
<software name="netbsd_5_2" cloneof="netbsd_5_2_3" supported="no">
|
||||
<description>NetBSD 5.2</description>
|
||||
<year>2012</year> <!-- 11/12 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6226,7 +6226,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_2_1" cloneof="netbsd_5_2_3">
|
||||
<software name="netbsd_5_2_1" cloneof="netbsd_5_2_3" supported="no">
|
||||
<description>NetBSD 5.2.1</description>
|
||||
<year>2013</year> <!-- 09/13 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6246,7 +6246,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_2_2" cloneof="netbsd_5_2_3">
|
||||
<software name="netbsd_5_2_2" cloneof="netbsd_5_2_3" supported="no">
|
||||
<description>NetBSD 5.2.2</description>
|
||||
<year>2014</year> <!-- 01/14 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6266,7 +6266,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_5_2_3">
|
||||
<software name="netbsd_5_2_3" supported="no">
|
||||
<description>NetBSD 5.2.3</description>
|
||||
<year>2014</year> <!-- 11/14 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6286,7 +6286,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_6_0" cloneof="netbsd_6_0_3">
|
||||
<software name="netbsd_6_0" cloneof="netbsd_6_0_3" supported="no">
|
||||
<description>NetBSD 6.0</description>
|
||||
<year>2012</year> <!-- 10/12 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6306,7 +6306,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_6_0_1" cloneof="netbsd_6_0_3">
|
||||
<software name="netbsd_6_0_1" cloneof="netbsd_6_0_3" supported="no">
|
||||
<description>NetBSD 6.0.1</description>
|
||||
<year>2012</year> <!-- 12/12 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6326,7 +6326,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_6_0_2" cloneof="netbsd_6_0_3">
|
||||
<software name="netbsd_6_0_2" cloneof="netbsd_6_0_3" supported="no">
|
||||
<description>NetBSD 6.0.2</description>
|
||||
<year>2013</year> <!-- 05/13 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
@ -6346,7 +6346,7 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="netbsd_6_0_3">
|
||||
<software name="netbsd_6_0_3" supported="no">
|
||||
<description>NetBSD 6.0.3</description>
|
||||
<year>2013</year> <!-- 09/13 -->
|
||||
<publisher>The NetBSD Project</publisher>
|
||||
|
@ -54223,7 +54223,7 @@ Side B: Once Upon a Lily Pad
|
||||
</software>
|
||||
|
||||
<software name="bruxolc_en_dm1" cloneof="bruxolc">
|
||||
<description>Bruxólico (demo 1.0, English)</description>
|
||||
<description>Bruxólico (English, demo 1.0)</description>
|
||||
<year>2022</year>
|
||||
<publisher>Amaweks</publisher>
|
||||
<info name="language" value="English" />
|
||||
@ -54235,7 +54235,7 @@ Side B: Once Upon a Lily Pad
|
||||
</software>
|
||||
|
||||
<software name="bruxolc_pt_dm1" cloneof="bruxolc">
|
||||
<description>Bruxólico (demo 1.0, Portuguese)</description>
|
||||
<description>Bruxólico (Portuguese, demo 1.0)</description>
|
||||
<year>2022</year>
|
||||
<publisher>Amaweks</publisher>
|
||||
<info name="language" value="Portuguese (Brazil)" />
|
||||
|
4
makefile
4
makefile
@ -1578,7 +1578,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.266"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.267"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
|
||||
else
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo #define BARE_BUILD_VERSION "0.266" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.267" > $@
|
||||
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
|
||||
@echo extern const char bare_build_version[]; >> $@
|
||||
@echo extern const char bare_vcs_revision[]; >> $@
|
||||
|
@ -6,7 +6,6 @@
|
||||
from . import dbaccess
|
||||
from . import htmltmpl
|
||||
|
||||
import cgi
|
||||
import inspect
|
||||
import json
|
||||
import mimetypes
|
||||
@ -16,11 +15,12 @@ import sys
|
||||
import urllib
|
||||
import wsgiref.util
|
||||
|
||||
if hasattr(cgi, 'escape'):
|
||||
htmlescape = cgi.escape
|
||||
else:
|
||||
try:
|
||||
import html
|
||||
htmlescape = html.escape
|
||||
except ImportError:
|
||||
import cgi
|
||||
htmlescape = cgi.escape
|
||||
|
||||
try:
|
||||
import urllib.parse as urlparse
|
||||
|
@ -2,10 +2,9 @@
|
||||
// copyright-holders:Andrew Gardner
|
||||
#include "emu.h"
|
||||
#include "inst.h"
|
||||
#include "emu.h"
|
||||
|
||||
namespace DSP_56156
|
||||
{
|
||||
namespace DSP_56156 {
|
||||
|
||||
// Factory
|
||||
std::unique_ptr<Instruction> Instruction::decodeInstruction(const Opcode* opc,
|
||||
const uint16_t word0,
|
||||
@ -783,4 +782,4 @@ std::unique_ptr<Instruction> Instruction::decodeInstruction(const Opcode* opc,
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace DSP_56156
|
||||
|
@ -6,6 +6,7 @@
|
||||
|
||||
#include "emu.h"
|
||||
#include "m68hc05e1.h"
|
||||
#include "m6805defs.h"
|
||||
#include "6805dasm.h"
|
||||
|
||||
#define VERBOSE (0)
|
||||
|
@ -321,7 +321,7 @@ void wswan_state::pockchv2(machine_config &config)
|
||||
wswan_base(config);
|
||||
|
||||
// software lists
|
||||
SOFTWARE_LIST(config, "pc2_list").set_compatible("pockchalv2");
|
||||
SOFTWARE_LIST(config, "pc2_list").set_original("pockchalv2");
|
||||
}
|
||||
|
||||
void wscolor_state::wscolor(machine_config &config)
|
||||
|
@ -1508,6 +1508,7 @@ ROM_START( princnt )
|
||||
ROM_REGION( 0x100000, "maincpu", 0 )
|
||||
ROM_LOAD("tc538000.u3", 0x00000, 0x100000, CRC(e4e2bfe9) SHA1(b3a7727544918b9030c362694ddf9a2fc3bca8b4))
|
||||
ROM_END
|
||||
|
||||
ROM_START( princnt3 )
|
||||
ROM_REGION( 0x100000, "maincpu", 0 )
|
||||
ROM_LOAD("tc538000.3.u3", 0x00000, 0x100000, CRC(eed0a0f9) SHA1(c15b97c2c29b354136cef046f72a6443b415e673))
|
||||
|
Loading…
Reference in New Issue
Block a user