summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2018-07-23 12:29:25 +1000
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2018-07-23 12:29:25 +1000
commitccfcb431d0089f84ef37603c0bd76f78be69c9dd (patch) (github)
treedded74a8fcbf536f9a13dc8596fc304c428280d4
parent915a4acb173aa387ea8577294745f2df534fd96c (diff)
downloadmame-ccfcb431d0089f84ef37603c0bd76f78be69c9dd.tar.bz2
mame-ccfcb431d0089f84ef37603c0bd76f78be69c9dd.zip
cherry-pick fixes from mainline and clean up some stuff (nw)
-rw-r--r--README.md4
-rw-r--r--docs/source/initialsetup/compilingmame.rst2
-rw-r--r--src/devices/bus/hp_hil/hlekbd.cpp1
-rw-r--r--src/devices/cpu/mcs40/mcs40.h17
-rw-r--r--src/devices/cpu/mips/ps2vif1.cpp2
-rw-r--r--src/devices/cpu/mips/ps2vif1.h6
-rw-r--r--src/devices/cpu/mips/ps2vu.cpp2
-rw-r--r--src/devices/cpu/mips/ps2vu.h7
-rw-r--r--src/devices/machine/ps2dma.cpp1
-rw-r--r--src/devices/machine/ps2dma.h3
-rw-r--r--src/devices/machine/ps2intc.cpp3
-rw-r--r--src/devices/machine/ps2intc.h2
-rw-r--r--src/devices/machine/ps2mc.h1
-rw-r--r--src/devices/machine/ps2pad.h1
-rw-r--r--src/devices/video/ps2gif.cpp3
-rw-r--r--src/devices/video/ps2gif.h6
-rw-r--r--src/devices/video/ps2gs.cpp5
-rw-r--r--src/devices/video/ps2gs.h7
18 files changed, 26 insertions, 47 deletions
diff --git a/README.md b/README.md
index f6c28090a62..22d62f68ace 100644
--- a/README.md
+++ b/README.md
@@ -55,12 +55,12 @@ Visual Studio builds are also possible, but you still need [build environment](h
In order to generate solution and project files just run:
```
-make vs2015
+make vs2017
```
or use this command to build it directly using msbuild
```
-make vs2015 MSBUILD=1
+make vs2017 MSBUILD=1
```
diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst
index f306e58eb2f..262d423da80 100644
--- a/docs/source/initialsetup/compilingmame.rst
+++ b/docs/source/initialsetup/compilingmame.rst
@@ -38,7 +38,7 @@ Here are specific notes about compiling MAME for Microsoft Windows.
* You will need to download the toolset from that link to begin. Periodically, these tools are updated and newer versions of MAME from that point on will **require** updated tools to compile.
-* You can do compilation on Visual Studio 2015 (if installed on your PC) by using **make vs2015**. This will always regenerate the settings, so **REGENIE=1** is *not* needed.
+* You can do compilation on Visual Studio 2017 (if installed on your PC) by using **make vs2017**. This will always regenerate the settings, so **REGENIE=1** is *not* needed.
* Make sure you get SDL 2 2.0.3 or 2.0.4 as earlier versions are buggy.
diff --git a/src/devices/bus/hp_hil/hlekbd.cpp b/src/devices/bus/hp_hil/hlekbd.cpp
index b164cdcc355..5cca998409d 100644
--- a/src/devices/bus/hp_hil/hlekbd.cpp
+++ b/src/devices/bus/hp_hil/hlekbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
+#include "emu.h"
#include "hlekbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h
index 88ba0d81194..d8ca4059631 100644
--- a/src/devices/cpu/mcs40/mcs40.h
+++ b/src/devices/cpu/mcs40/mcs40.h
@@ -248,7 +248,7 @@ class i4004_cpu_device : public mcs40_cpu_device_base
{
public:
// configuration helpers
- auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); }
+ using mcs40_cpu_device_base::sync_cb;
auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<0>(); }
template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); }
@@ -269,11 +269,6 @@ protected:
virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override;
virtual void do_cycle2(u8 opr, u8 opa, u8 arg) override;
virtual u8 do_io(u8 opr, u8 opa) override;
-
- // configuration helpers
- using mcs40_cpu_device_base::sync_cb;
- using mcs40_cpu_device_base::cm_rom_cb;
- using mcs40_cpu_device_base::cm_ram_cb;
};
@@ -281,11 +276,10 @@ class i4040_cpu_device : public i4004_cpu_device
{
public:
// configuration helpers
- auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); }
template <unsigned N> auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<N>(); }
template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); }
auto cy_cb() { return i4004_cpu_device::cy_cb(); }
- auto stp_ack_cb() { return i4004_cpu_device::stp_ack_cb(); }
+ using mcs40_cpu_device_base::stp_ack_cb;
i4040_cpu_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
@@ -299,13 +293,6 @@ protected:
// mcs40_cpu_device_base implementation
virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override;
-
- // configuration helpers
- using mcs40_cpu_device_base::sync_cb;
- using mcs40_cpu_device_base::cm_rom_cb;
- using mcs40_cpu_device_base::cm_ram_cb;
- using mcs40_cpu_device_base::cy_cb;
- using mcs40_cpu_device_base::stp_ack_cb;
};
diff --git a/src/devices/cpu/mips/ps2vif1.cpp b/src/devices/cpu/mips/ps2vif1.cpp
index 203511141b7..d8e7827cdae 100644
--- a/src/devices/cpu/mips/ps2vif1.cpp
+++ b/src/devices/cpu/mips/ps2vif1.cpp
@@ -14,8 +14,6 @@
#include "emu.h"
#include "ps2vif1.h"
-#include "ps2vu.h"
-#include "video/ps2gs.h"
#include "video/ps2gif.h"
DEFINE_DEVICE_TYPE(SONYPS2_VIF1, ps2_vif1_device, "ps2vif1", "PlayStation 2 VIF1")
diff --git a/src/devices/cpu/mips/ps2vif1.h b/src/devices/cpu/mips/ps2vif1.h
index 6241381e7dc..90ec1417ded 100644
--- a/src/devices/cpu/mips/ps2vif1.h
+++ b/src/devices/cpu/mips/ps2vif1.h
@@ -14,8 +14,10 @@
#pragma once
-class ps2_gs_device;
-class sonyvu1_device;
+class ps2_vif1_device;
+
+#include "video/ps2gs.h"
+#include "ps2vu.h"
class ps2_vif1_device : public device_t, public device_execute_interface
{
diff --git a/src/devices/cpu/mips/ps2vu.cpp b/src/devices/cpu/mips/ps2vu.cpp
index 491af559fc9..6f3803b92a0 100644
--- a/src/devices/cpu/mips/ps2vu.cpp
+++ b/src/devices/cpu/mips/ps2vu.cpp
@@ -12,8 +12,6 @@
#include "emu.h"
#include "ps2vu.h"
-#include "ps2vif1.h"
-#include "video/ps2gs.h"
#include "video/ps2gif.h"
#include "vudasm.h"
#include "debugger.h"
diff --git a/src/devices/cpu/mips/ps2vu.h b/src/devices/cpu/mips/ps2vu.h
index 04b94c9a5f1..c2e99668ffd 100644
--- a/src/devices/cpu/mips/ps2vu.h
+++ b/src/devices/cpu/mips/ps2vu.h
@@ -14,8 +14,11 @@
#pragma once
-class ps2_gs_device;
-class ps2_vif1_device;
+class sonyvu0_device;
+class sonyvu1_device;
+
+#include "video/ps2gs.h"
+#include "ps2vif1.h"
enum
{
diff --git a/src/devices/machine/ps2dma.cpp b/src/devices/machine/ps2dma.cpp
index 86cc249798a..678f106025e 100644
--- a/src/devices/machine/ps2dma.cpp
+++ b/src/devices/machine/ps2dma.cpp
@@ -12,7 +12,6 @@
#include "emu.h"
#include "ps2dma.h"
-#include "ps2sif.h"
#include "cpu/mips/mips3.h"
#include "cpu/mips/ps2vif1.h"
#include "video/ps2gif.h"
diff --git a/src/devices/machine/ps2dma.h b/src/devices/machine/ps2dma.h
index 1eeec4f4f2a..10470fd52fa 100644
--- a/src/devices/machine/ps2dma.h
+++ b/src/devices/machine/ps2dma.h
@@ -16,8 +16,7 @@
#include "cpu/mips/ps2vu.h"
#include "video/ps2gs.h"
-
-class ps2_sif_device;
+#include "ps2sif.h"
class ps2_dmac_device : public device_t, public device_execute_interface
{
diff --git a/src/devices/machine/ps2intc.cpp b/src/devices/machine/ps2intc.cpp
index 15581ce3936..f9053f60d2d 100644
--- a/src/devices/machine/ps2intc.cpp
+++ b/src/devices/machine/ps2intc.cpp
@@ -12,9 +12,6 @@
#include "emu.h"
#include "ps2intc.h"
-#include "cpu/mips/ps2vu.h"
-
-
DEFINE_DEVICE_TYPE(SONYPS2_INTC, ps2_intc_device, "ps2intc", "PlayStation 2 EE INTC")
ps2_intc_device::ps2_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/ps2intc.h b/src/devices/machine/ps2intc.h
index 078061fbb9d..f6ec945741e 100644
--- a/src/devices/machine/ps2intc.h
+++ b/src/devices/machine/ps2intc.h
@@ -14,6 +14,8 @@
#pragma once
+class ps2_intc_device;
+
#include "cpu/mips/mips3.h"
class ps2_intc_device : public device_t
diff --git a/src/devices/machine/ps2mc.h b/src/devices/machine/ps2mc.h
index b3f120f62a1..ef38dea72c2 100644
--- a/src/devices/machine/ps2mc.h
+++ b/src/devices/machine/ps2mc.h
@@ -14,7 +14,6 @@
#pragma once
-
class ps2_mc_device : public device_t
{
public:
diff --git a/src/devices/machine/ps2pad.h b/src/devices/machine/ps2pad.h
index dcfb8125052..2b384fd0818 100644
--- a/src/devices/machine/ps2pad.h
+++ b/src/devices/machine/ps2pad.h
@@ -14,7 +14,6 @@
#pragma once
-
class ps2_pad_device : public device_t
{
public:
diff --git a/src/devices/video/ps2gif.cpp b/src/devices/video/ps2gif.cpp
index bfc404d2627..82ee34e267e 100644
--- a/src/devices/video/ps2gif.cpp
+++ b/src/devices/video/ps2gif.cpp
@@ -12,9 +12,6 @@
#include "emu.h"
#include "ps2gif.h"
-#include "ps2gs.h"
-#include "cpu/mips/ps2vu.h"
-
DEFINE_DEVICE_TYPE(SONYPS2_GIF, ps2_gif_device, "ps2gif", "Playstation 2 GIF")
ps2_gif_device::ps2_gif_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/video/ps2gif.h b/src/devices/video/ps2gif.h
index 813a67a4678..d6275d759ac 100644
--- a/src/devices/video/ps2gif.h
+++ b/src/devices/video/ps2gif.h
@@ -14,8 +14,10 @@
#pragma once
-class ps2_gs_device;
-class sonyvu1_device;
+class ps2_gif_device;
+
+#include "ps2gs.h"
+#include "cpu/mips/ps2vu.h"
class ps2_gif_device : public device_t, public device_execute_interface
{
diff --git a/src/devices/video/ps2gs.cpp b/src/devices/video/ps2gs.cpp
index aa83adff58b..79a7653dafa 100644
--- a/src/devices/video/ps2gs.cpp
+++ b/src/devices/video/ps2gs.cpp
@@ -12,11 +12,6 @@
#include "emu.h"
#include "ps2gs.h"
-#include "ps2gif.h"
-#include "machine/ps2intc.h"
-#include "cpu/mips/ps2vu.h"
-
-
DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS")
/*static*/ const size_t ps2_gs_device::FORMAT_PIXEL_WIDTHS[] = {
diff --git a/src/devices/video/ps2gs.h b/src/devices/video/ps2gs.h
index 77de9f40a6f..a68ae9913df 100644
--- a/src/devices/video/ps2gs.h
+++ b/src/devices/video/ps2gs.h
@@ -14,10 +14,11 @@
#pragma once
+class ps2_gs_device;
-class ps2_intc_device;
-class ps2_gif_device;
-class sonyvu1_device;
+#include "ps2gif.h"
+#include "machine/ps2intc.h"
+#include "cpu/mips/ps2vu.h"
class ps2_gs_device : public device_t
{