Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 13:34:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
David Haywood 2015-12-12 15:16:16 +00:00
commit 2b530503db
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/src/3rdparty.lua
View File

@ -129,11 +129,19 @@ project "softfloat"
includedirs {
MAME_DIR .. "src/osd",
}
configuration { "vs*" }
buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
"/wd4146", -- warning C4146: unary minus operator applied to unsigned type, result still unsigned
"/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
"/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
configuration { }
files {
MAME_DIR .. "3rdparty/softfloat/softfloat.c",
MAME_DIR .. "3rdparty/softfloat/fsincos.c",

1
src/devices/cpu/m68000/m68kcpu.cpp
View File

@ -1733,7 +1733,6 @@ void m68000_base_device::define_state(void)
state_add(M68K_USP, "USP", iotemp).callimport().callexport();
if (cpu_type & MASK_020_OR_LATER)
state_add(M68K_MSP, "MSP", iotemp).callimport().callexport();
state_add(M68K_ISP, "ISP", iotemp).callimport().callexport();
std::string tempstr;
for (int regnum = 0; regnum < 8; regnum++) {