Skip to content

Commit 2c56d03

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 0f46fd1 + 32736e4 commit 2c56d03

14 files changed

+463
-451
lines changed

hash/x68k_flop.xml

+26
Original file line numberDiff line numberDiff line change
@@ -27605,6 +27605,19 @@ No sound (verify)
2760527605
</part>
2760627606
</software>
2760727607

27608+
<!-- boot OK -->
27609+
<software name="lforce" supported="yes">
27610+
<description>Last Force - The Virtual Battle in 1930's</description>
27611+
<year>1993</year>
27612+
<publisher>&lt;doujin&gt;</publisher>
27613+
<info name="developer" value="Hong Kong Project" />
27614+
<part name="flop1" interface="floppy_5_25">
27615+
<dataarea name="flop" size="1281968">
27616+
<rom name="last force - the virtual battle in 1930's (1993)(hong kong project).d88" size="1281968" crc="5df0a3d1" sha1="c2ef029af1b619d4fab9ca441f122e848aa5824a" />
27617+
</dataarea>
27618+
</part>
27619+
</software>
27620+
2760827621
<software name="lastpic2">
2760927622
<description>Last Piece II</description>
2761027623
<year>1990</year>
@@ -33060,6 +33073,19 @@ Has no title screen/intro GFXs
3306033073
</part>
3306133074
</software>
3306233075

33076+
<!-- boot OK -->
33077+
<software name="xadlakp" supported="yes">
33078+
<description>Xadlak Plus</description>
33079+
<year>1996</year>
33080+
<publisher>&lt;doujin&gt;</publisher>
33081+
<info name="developer" value="Sprite" />
33082+
<part name="flop1" interface="floppy_5_25">
33083+
<dataarea name="flop" size="1261568">
33084+
<rom name="xadlak plus (1996)(sprite).2hd" size="1261568" crc="c5e16cff" sha1="c122a3060f70a813a554e9e3c38b3373351e75d1" />
33085+
</dataarea>
33086+
</part>
33087+
</software>
33088+
3306333089
<software name="xanadu">
3306433090
<description>Xanadu</description>
3306533091
<year>1994</year>

makefile

-1
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,6 @@ CPPCHECK_PARAMS += -I3rdparty/bx/include
16871687
CPPCHECK_PARAMS += -I$(BUILDDIR)/generated/emu
16881688
CPPCHECK_PARAMS += -I$(BUILDDIR)/generated/emu/layout
16891689
CPPCHECK_PARAMS += -I$(BUILDDIR)/generated/mame/layout
1690-
CPPCHECK_PARAMS += -DX64_WINDOWS_ABI
16911690
CPPCHECK_PARAMS += -DPTR64=1
16921691
CPPCHECK_PARAMS += -DMAME_DEBUG
16931692
CPPCHECK_PARAMS += -DMAME_PROFILER

0 commit comments

Comments
 (0)