Skip to content

Commit 46961d6

Browse files
RobbbertRobbbert
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # docs/source/advanced/bgfx.rst # docs/source/commandline/commandline-all.rst # docs/source/initialsetup/compilingmame.rst # docs/source/initialsetup/mameintro.rst # scripts/src/osd/modules.lua
2 parents a4ac07b + 9fd708f commit 46961d6

45 files changed

Lines changed: 729 additions & 554 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎hash/pc88va_flop_orig.xml‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
3+
<!--
4+
license:CC0-1.0
5+
-->
6+
<softwarelist name="pc88va_flop_orig" description="NEC PC-88VA original disk images">
7+
8+
<software name="alantia" supported="no">
9+
<description>Alantia VA Special</description>
10+
<year>1988</year>
11+
<publisher>ビクター音楽産業 (Victor Musical Industries)</publisher>
12+
<notes><![CDATA[
13+
Garbage layer covering title and gameplay
14+
[FDC] randomly doesn't boot
15+
]]></notes>
16+
<info name="alt_title" value="アランティアＶＡスペシャル" />
17+
<info name="developer" value="Cross Media Soft" />
18+
<info name="release" value="198811xx" />
19+
<!-- TODO: claims Disks 1 ~ 2 ~ 3 when swapping, but package comes with A ~ B ~ C (?) -->
20+
<part name="flop1" interface="floppy_5_25">
21+
<feature name="part_id" value="Disk A"/>
22+
<dataarea name="flop" size="6438423">
23+
<rom name="alantia va special (disk a).mfi" size="6438423" crc="35fd853b" sha1="4f46f322f34156f1ffc81282f646303709c9a58a" offset="0" />
24+
</dataarea>
25+
</part>
26+
<part name="flop2" interface="floppy_5_25">
27+
<feature name="part_id" value="Disk B"/>
28+
<dataarea name="flop" size="5302992">
29+
<rom name="alantia va special (disk b).mfi" size="5302992" crc="d83082dc" sha1="a8e167fbe2ebc41918da54dc55b982bfdcb193dc" offset="0" />
30+
</dataarea>
31+
</part>
32+
<part name="flop3" interface="floppy_5_25">
33+
<feature name="part_id" value="Disk C"/>
34+
<dataarea name="flop" size="5509048">
35+
<rom name="alantia va special (disk c).mfi" size="5509048" crc="8062f0be" sha1="624f2173c76f3ebefda462dbb51cc419c5e10e07" offset="0" />
36+
</dataarea>
37+
</part>
38+
</software>
39+
40+
<software name="fqueen" supported="no">
41+
<description>First Queen</description>
42+
<year>1989</year>
43+
<publisher>呉ソフトウェア工房 (Kure Software Koubou)</publisher>
44+
<notes><![CDATA[
45+
Text boxes often don't draw properly, making readability hard
46+
]]></notes>
47+
<info name="alt_title" value="ファーストクイーン" />
48+
<info name="release" value="198901xx" />
49+
<part name="flop1" interface="floppy_5_25">
50+
<feature name="part_id" value="Disk A"/>
51+
<dataarea name="flop" size="5469380">
52+
<rom name="firstqueen (disk a).mfi" size="5469380" crc="d6a94fd1" sha1="a11abc42dfa99d45ed4c843efa1eb3b30b6ec8fc" offset="0" />
53+
</dataarea>
54+
</part>
55+
<part name="flop2" interface="floppy_5_25">
56+
<feature name="part_id" value="Disk B"/>
57+
<dataarea name="flop" size="5842664">
58+
<rom name="firstqueen (disk b).mfi" size="5842664" crc="1f89112e" sha1="cadc1dfca83cdcbdb13e82a4f01a5c1ebf54bda3" offset="0" />
59+
</dataarea>
60+
</part>
61+
</software>
62+
63+
<software name="kawaisom" supported="no">
64+
<description>Kawaisou Monogatari</description>
65+
<year>1987</year>
66+
<publisher>システムソフト (SystemSoft)</publisher>
67+
<notes><![CDATA[
68+
[FDC] DISK ERROR at startup
69+
]]></notes>
70+
<info name="alt_title" value="かわいそう物語" />
71+
<info name="release" value="198712xx" />
72+
<sharedfeat name="mouseport_default" value="mouse"/>
73+
74+
<part name="flop1" interface="floppy_5_25">
75+
<feature name="part_id" value="Disk A"/>
76+
<dataarea name="flop" size="5329817">
77+
<rom name="kawaisou monogatari (disk a).mfi" size="5329817" crc="36f34b1" sha1="06b6088aec27c4e44cd0f09c3fb5fd3774c64e8e" offset="0" />
78+
</dataarea>
79+
</part>
80+
<part name="flop2" interface="floppy_5_25">
81+
<feature name="part_id" value="Disk B"/>
82+
<dataarea name="flop" size="5363454">
83+
<rom name="kawaisou monogatari (disk b).mfi" size="5363454" crc="1347cbc4" sha1="7929f48c649857e2ed5a03fcbf8a61534ee1e9f6" offset="0" />
84+
</dataarea>
85+
</part>
86+
<part name="flop3" interface="floppy_5_25">
87+
<feature name="part_id" value="Original Scenario Disk"/>
88+
<dataarea name="flop" size="5285696">
89+
<rom name="kawaisou monogatari (original scenario disk).mfi" size="5285696" crc="931980ca" sha1="43253b591dc48a72d45436793c7398fa4edc1e69" offset="0" />
90+
</dataarea>
91+
</part>
92+
</software>
93+
94+
<software name="lodoss" supported="no">
95+
<description>Record of Lodoss War - Haiiro no Majo</description>
96+
<year>1988</year>
97+
<publisher>ハミングバード (HummingBird)</publisher>
98+
<notes><![CDATA[
99+
[FDC] randomly black screen
100+
]]></notes>
101+
<info name="alt_title" value="ロードス島戦記 灰色の魔女" />
102+
<info name="release" value="198809xx" />
103+
<sharedfeat name="mouseport_default" value="mouse"/>
104+
105+
<part name="flop1" interface="floppy_5_25">
106+
<feature name="part_id" value="Program Disk"/>
107+
<dataarea name="flop" size="5952678">
108+
<rom name="lodoss-tou senki - haiiro no majo (program disk).mfi" size="5952678" crc="99d7e0b8" sha1="c66181cd2c1e0f02bc95705077c68e4d39e480a5" offset="0" />
109+
</dataarea>
110+
</part>
111+
<part name="flop2" interface="floppy_5_25">
112+
<feature name="part_id" value="Save Disk"/>
113+
<dataarea name="flop" size="5650068">
114+
<rom name="lodoss-tou senki - haiiro no majo (save disk).mfi" size="5650068" crc="9ac52112" sha1="828f0f9a9d819fc506b0cc6d94cabc129f5c5a06" offset="0" />
115+
</dataarea>
116+
</part>
117+
<part name="flop3" interface="floppy_5_25">
118+
<feature name="part_id" value="Scenario Disk"/>
119+
<dataarea name="flop" size="6232910">
120+
<rom name="lodoss-tou senki - haiiro no majo (scenario disk).mfi" size="6232910" crc="c2959317" sha1="27125b0551563d411aa649dc0e319ff1a699a69c" offset="0" />
121+
</dataarea>
122+
</part>
123+
</software>
124+
125+
</softwarelist>

‎hash/trs80_cass.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
396396
</part>
397397
</software>
398398
<software name="env">
399-
<description>Les Invasiou des Extras-terrestres</description>
400-
<year>19??</year>
399+
<description>L'Invasion des Extras-terrestres</description>
400+
<year>1983</year>
401401
<publisher>Sivea</publisher>
402402
<info name="author" value="Xavier Ackaouy" />
403403
<info name="usage" value="(Model 3/4: Answer L at Cass? prompt), Enter, SYSTEM then ENV then /" />
@@ -487,7 +487,7 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
487487
<software name="adv03">
488488
<description>Mission Impossible</description>
489489
<year>1979</year>
490-
<publisher>&lt;unknown&gt;</publisher>
490+
<publisher>Adventure International</publisher>
491491
<info name="author" value="Scott Adams" />
492492
<info name="usage" value="(Model 3/4: Answer L at Cass? prompt), Enter, SYSTEM then MISSIO then /" />
493493
<sharedfeat name="compatibility" value="1,3,4,H" />
@@ -614,7 +614,7 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
614614
<software name="seadragon">
615615
<description>Seadragon</description>
616616
<year>1982</year>
617-
<publisher>&lt;unknown&gt;</publisher>
617+
<publisher>Adventure International</publisher>
618618
<info name="author" value="Wayne Westmoreland and Terry Gilman" />
619619
<info name="usage" value="(Model 3/4: Answer L at Cass? prompt), Enter, SYSTEM then SEADRA then /" />
620620
<sharedfeat name="compatibility" value="1,3,4,H" />
@@ -653,7 +653,7 @@ Note that trs80m4p doesn't physically have a cassette interface, so no tapes can
653653
<software name="spcwarp">
654654
<description>Space Warp</description>
655655
<year>1978</year>
656-
<publisher>&lt;unknown&gt;</publisher>
656+
<publisher>Radio Shack</publisher>
657657
<info name="author" value="Joshua Lavinsky" />
658658
<info name="usage" value="(Model 3/4: Answer L at Cass? prompt), Enter, SYSTEM then SPWAR" />
659659
<sharedfeat name="compatibility" value="1,3,4,H" />

‎makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ ifeq ($(MSYSTEM),MINGW32)
150150
PLATFORM := x86
151151
else ifeq ($(MSYSTEM),MINGW64)
152152
PLATFORM := x86
153+
else ifeq ($(MSYSTEM),CLANG64)
154+
PLATFORM := x86
153155
else ifeq ($(MSYSTEM),CLANGARM64)
154156
PLATFORM := arm64
155157
else # MSYSTEM
@@ -247,6 +249,8 @@ ifeq ($(MSYSTEM),MINGW32)
247249
MINGW32 := $(MINGW_PREFIX)
248250
else ifeq ($(MSYSTEM),MINGW64)
249251
MINGW64 := $(MINGW_PREFIX)
252+
else ifeq ($(MSYSTEM),CLANG64)
253+
MINGW64 := $(MINGW_PREFIX)
250254
else ifeq ($(MSYSTEM),CLANGARM64)
251255
MINGW64 := $(MINGW_PREFIX)
252256
endif # MSYSTEM
@@ -318,6 +322,8 @@ ifeq ($(MSYSTEM),MINGW32)
318322
ARCHITECTURE = _x86
319323
else ifeq ($(MSYSTEM),MINGW64)
320324
ARCHITECTURE := _x64
325+
else ifeq ($(MSYSTEM),CLANG64)
326+
ARCHITECTURE := _x64
321327
else ifeq ($(MSYSTEM),CLANGARM64)
322328
ARCHITECTURE := _x64
323329
else ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)

‎scripts/genie.lua‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,11 +1252,8 @@ configuration { "vs20*" }
12521252
if _OPTIONS["vs"]==nil then
12531253
buildoptions {
12541254
"/bigobj",
1255-
"/permissive-",
12561255
"/utf-8",
1257-
"/Zc:enumTypes",
12581256
"/Zc:preprocessor",
1259-
"/Zc:templateScope",
12601257
}
12611258

12621259
buildoptions {
@@ -1293,10 +1290,13 @@ if _OPTIONS["vs"]==nil then
12931290

12941291
buildoptions_cpp {
12951292
"/Zc:__cplusplus",
1296-
"/std:c++20",
1293+
"/Zc:enumTypes",
1294+
"/Zc:templateScope",
1295+
"/Zc:u8EscapeEncoding",
12971296
}
12981297

12991298
flags {
1299+
"Cpp20",
13001300
"ExtraWarnings",
13011301
}
13021302
elseif _OPTIONS["vs"]=="intel-15" then
@@ -1359,6 +1359,7 @@ elseif _OPTIONS["vs"]=="clangcl" then
13591359
end
13601360

13611361
flags {
1362+
"Cpp20",
13621363
-- don't set ExtraWarnings flag (/W4 == -Wall -Wextra); use default (/W3 == -Wall) instead
13631364
}
13641365
end

‎scripts/src/mame/frontend.lua‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ if (_OPTIONS["targetos"] == "windows" or _OPTIONS["targetos"]=="newui" or _OPTIO
5151
}
5252
end
5353

54-
if (_OPTIONS["osd"] == "sdl") then
55-
defines {
56-
"UI_SDL",
57-
}
58-
end
59-
6054
files {
6155
MAME_DIR .. "src/frontend/mame/audit.cpp",
6256
MAME_DIR .. "src/frontend/mame/audit.h",

‎scripts/src/osd/modules.lua‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,6 @@ function osdmodulesbuild()
155155
ext_includedir("asio"),
156156
}
157157

158-
if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
159-
buildoptions {
160-
"-Wno-unused-private-field",
161-
}
162-
end
163-
164158
if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="winui" or _OPTIONS["targetos"]=="messui" then
165159
includedirs {
166160
MAME_DIR .. "3rdparty/compat/mingw",
@@ -364,6 +358,11 @@ function qtdebuggerbuild()
364358
buildoptions {
365359
"-Wno-error=inconsistent-missing-override",
366360
}
361+
if _OPTIONS["targetos"]=="windows" then
362+
buildoptions {
363+
"-Wno-ignored-attributes",
364+
}
365+
end
367366
configuration { }
368367
end
369368

@@ -407,7 +406,19 @@ function qtdebuggerbuild()
407406

408407
local MOC = ""
409408
if (os.is("windows")) then
410-
MOC = "moc"
409+
local qt_host_libexecs
410+
if _OPTIONS["QT_HOME"]~=nil then
411+
qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS")
412+
else
413+
qt_host_libexecs = backtick("qmake -query QT_HOST_LIBEXECS")
414+
end
415+
MOCTST = backtick(qt_host_libexecs .. "/moc --version")
416+
if MOCTST=='' then
417+
print("Qt's Meta Object Compiler (moc) wasn't found!")
418+
os.exit(1)
419+
else
420+
MOC = qt_host_libexecs .. "/moc"
421+
end
411422
else
412423
if _OPTIONS["QT_HOME"]~=nil then
413424
local MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
@@ -521,9 +532,9 @@ function osdmodulestargetconf()
521532
"-L$(shell qmake -query QT_INSTALL_LIBS)",
522533
}
523534
links {
524-
"Qt5Core.dll",
525-
"Qt5Gui.dll",
526-
"Qt5Widgets.dll",
535+
"Qt6Core.dll",
536+
"Qt6Gui.dll",
537+
"Qt6Widgets.dll",
527538
}
528539
elseif _OPTIONS["targetos"]=="macosx" then
529540
local qt_version = str_to_version(backtick("qmake -query QT_VERSION"))

‎scripts/src/osd/sdl3.lua‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,13 @@ function maintargetosdoptions(_target,_subtarget)
8383

8484
links {
8585
"dinput8",
86+
"gdi32",
87+
"imm32",
88+
"ole32",
8689
"psapi",
90+
"setupapi",
91+
"uuid",
92+
"version",
8793
}
8894
elseif _OPTIONS["targetos"]=="haiku" then
8995
links {

‎scripts/src/tools.lua‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,13 @@ if (_OPTIONS["osd"] == "sdl") or (_OPTIONS["osd"] == "sdl3") then
816816
end
817817
links {
818818
libsdl,
819+
"gdi32",
820+
"imm32",
821+
"ole32",
822+
"oleaut32",
823+
"setupapi",
824+
"uuid",
825+
"version",
819826
}
820827
configuration { "vs*" }
821828
links {

‎src/devices/cpu/drcbearm64.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,7 +1758,7 @@ void drcbe_arm64::generate(drcuml_block &block, const instruction *instlist, uin
17581758
uintptr_t linemask = 63;
17591759
if (err)
17601760
{
1761-
osd_printf_verbose("Error getting cache line size (%s:%d %s), assuming 64 bytes\n", err.category().name(), err.value(), err.message());
1761+
osd_printf_verbose("drcbe_arm64(%s): Error getting cache line size (%s:%d %s), assuming 64 bytes\n", m_device.tag(), err.category().name(), err.value(), err.message());
17621762
}
17631763
else
17641764
{
@@ -1842,7 +1842,7 @@ void drcbe_arm64::get_info(drcbe_info &info) const noexcept
18421842

18431843
[[noreturn]] void drcbe_arm64::end_of_block() const
18441844
{
1845-
osd_printf_error("drcbe_arm64(%s): fell off the end of a generated code block!\n", m_device.tag());
1845+
osd_printf_error("drcbe_arm64(%s): Fell off the end of a generated code block!\n", m_device.tag());
18461846
std::fflush(stdout);
18471847
std::fflush(stderr);
18481848
std::abort();

0 commit comments

Comments
 (0)