From c15d7adef347210ef25b031dca68b6f9e77db0ff Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 12 Dec 2015 15:03:22 +0100 Subject: [PATCH 1/2] compile parameters specific for 3rdparty component (nw) --- scripts/src/3rdparty.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 30de060cd6e..761257dc930 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -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", From c2aff817f7733649aecc4fbcf4f024a8dd73d15d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 12 Dec 2015 16:15:36 +0100 Subject: [PATCH 2/2] fixed duplicated save state (nw) --- src/devices/cpu/m68000/m68kcpu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index a8f52a6cdcd..5b6d2a602bf 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -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++) {