From f6670511797a389e290b4dfdd37291187ff42bae Mon Sep 17 00:00:00 2001 From: smf- Date: Sun, 22 Jul 2018 11:17:17 +0100 Subject: build with MSVC (nw) --- src/devices/cpu/mips/ps2vif1.cpp | 4 +--- src/devices/cpu/mips/ps2vif1.h | 7 ++++--- src/devices/cpu/mips/ps2vu.h | 5 ++++- src/devices/machine/ps2dma.cpp | 2 +- src/devices/machine/ps2dma.h | 4 ++-- src/devices/machine/ps2intc.cpp | 2 +- src/devices/machine/ps2intc.h | 3 +-- src/devices/machine/ps2mc.cpp | 1 + src/devices/machine/ps2mc.h | 4 +--- src/devices/machine/ps2pad.cpp | 1 + src/devices/machine/ps2pad.h | 4 +--- src/devices/machine/ps2sif.cpp | 2 +- src/devices/machine/ps2sif.h | 3 +-- src/devices/video/ps2gif.cpp | 3 +-- src/devices/video/ps2gif.h | 7 ++++--- src/devices/video/ps2gs.cpp | 5 ++--- src/devices/video/ps2gs.h | 10 ++++++---- 17 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/devices/cpu/mips/ps2vif1.cpp b/src/devices/cpu/mips/ps2vif1.cpp index 9cc6135a852..cb5e5da275e 100644 --- a/src/devices/cpu/mips/ps2vif1.cpp +++ b/src/devices/cpu/mips/ps2vif1.cpp @@ -11,10 +11,8 @@ * */ +#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 3ad1dcb1c86..0ef8482280a 100644 --- a/src/devices/cpu/mips/ps2vif1.h +++ b/src/devices/cpu/mips/ps2vif1.h @@ -14,8 +14,6 @@ #pragma once -#include "emu.h" - class ps2_gs_device; class sonyvu1_device; @@ -157,4 +155,7 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_VIF1, ps2_vif1_device) -#endif // DEVICES_MACHINE_PS2VIF1_H \ No newline at end of file +#include "video/ps2gs.h" +#include "ps2vu.h" + +#endif // DEVICES_MACHINE_PS2VIF1_H diff --git a/src/devices/cpu/mips/ps2vu.h b/src/devices/cpu/mips/ps2vu.h index 3132fd2f939..9f22e9384ad 100644 --- a/src/devices/cpu/mips/ps2vu.h +++ b/src/devices/cpu/mips/ps2vu.h @@ -242,4 +242,7 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_VU1, sonyvu1_device) DECLARE_DEVICE_TYPE(SONYPS2_VU0, sonyvu0_device) -#endif // MAME_CPU_MIPS_PS2VU_H \ No newline at end of file +#include "video/ps2gs.h" +#include "cpu/mips/ps2vif1.h" + +#endif // MAME_CPU_MIPS_PS2VU_H diff --git a/src/devices/machine/ps2dma.cpp b/src/devices/machine/ps2dma.cpp index 5bb422398bd..e3c8275fdb8 100644 --- a/src/devices/machine/ps2dma.cpp +++ b/src/devices/machine/ps2dma.cpp @@ -9,7 +9,7 @@ * */ -#include "ps2sif.h" +#include "emu.h" #include "ps2dma.h" #include "cpu/mips/mips3.h" #include "cpu/mips/ps2vif1.h" diff --git a/src/devices/machine/ps2dma.h b/src/devices/machine/ps2dma.h index 134dfbe328a..a8a0f43476e 100644 --- a/src/devices/machine/ps2dma.h +++ b/src/devices/machine/ps2dma.h @@ -14,7 +14,7 @@ #pragma once -#include "emu.h" +#include "ps2sif.h" #include "video/ps2gs.h" #include "cpu/mips/ps2vu.h" @@ -148,4 +148,4 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_DMAC, ps2_dmac_device) -#endif // DEVICES_MACHINE_PS2DMAC_H \ No newline at end of file +#endif // DEVICES_MACHINE_PS2DMAC_H diff --git a/src/devices/machine/ps2intc.cpp b/src/devices/machine/ps2intc.cpp index 57ce3172316..e1bb2a6046b 100644 --- a/src/devices/machine/ps2intc.cpp +++ b/src/devices/machine/ps2intc.cpp @@ -9,8 +9,8 @@ * */ +#include "emu.h" #include "ps2intc.h" -#include "cpu/mips/ps2vu.h" DEFINE_DEVICE_TYPE(SONYPS2_INTC, ps2_intc_device, "ps2intc", "PlayStation 2 EE INTC") diff --git a/src/devices/machine/ps2intc.h b/src/devices/machine/ps2intc.h index 34825264085..3d5d305fdcf 100644 --- a/src/devices/machine/ps2intc.h +++ b/src/devices/machine/ps2intc.h @@ -14,7 +14,6 @@ #pragma once -#include "emu.h" #include "cpu/mips/mips3.h" class ps2_intc_device : public device_t @@ -67,4 +66,4 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_INTC, ps2_intc_device) -#endif // DEVICES_MACHINE_PS2INTC_H \ No newline at end of file +#endif // DEVICES_MACHINE_PS2INTC_H diff --git a/src/devices/machine/ps2mc.cpp b/src/devices/machine/ps2mc.cpp index 88f76b717c5..68ec1a54a1b 100644 --- a/src/devices/machine/ps2mc.cpp +++ b/src/devices/machine/ps2mc.cpp @@ -9,6 +9,7 @@ * */ +#include "emu.h" #include "ps2mc.h" DEFINE_DEVICE_TYPE(SONYPS2_MC, ps2_mc_device, "ps2mc", "PlayStation 2 Memory Card") diff --git a/src/devices/machine/ps2mc.h b/src/devices/machine/ps2mc.h index f6b291d595f..c7551c1fce3 100644 --- a/src/devices/machine/ps2mc.h +++ b/src/devices/machine/ps2mc.h @@ -14,8 +14,6 @@ #pragma once -#include "emu.h" - class ps2_mc_device : public device_t { public: @@ -72,4 +70,4 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_MC, ps2_mc_device) -#endif // DEVICES_MACHINE_PS2MC_H \ No newline at end of file +#endif // DEVICES_MACHINE_PS2MC_H diff --git a/src/devices/machine/ps2pad.cpp b/src/devices/machine/ps2pad.cpp index 5ec69f7c624..fe7e7c0a3ec 100644 --- a/src/devices/machine/ps2pad.cpp +++ b/src/devices/machine/ps2pad.cpp @@ -9,6 +9,7 @@ * */ +#include "emu.h" #include "ps2pad.h" DEFINE_DEVICE_TYPE(SONYPS2_PAD, ps2_pad_device, "ps2pad", "Sony DualShock 2") diff --git a/src/devices/machine/ps2pad.h b/src/devices/machine/ps2pad.h index 166372b378b..0343e8e52ac 100644 --- a/src/devices/machine/ps2pad.h +++ b/src/devices/machine/ps2pad.h @@ -14,8 +14,6 @@ #pragma once -#include "emu.h" - class ps2_pad_device : public device_t { public: @@ -75,4 +73,4 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_PAD, ps2_pad_device) -#endif // DEVICES_MACHINE_PS2PAD_H \ No newline at end of file +#endif // DEVICES_MACHINE_PS2PAD_H diff --git a/src/devices/machine/ps2sif.cpp b/src/devices/machine/ps2sif.cpp index 26c09293774..73b055d2cc5 100644 --- a/src/devices/machine/ps2sif.cpp +++ b/src/devices/machine/ps2sif.cpp @@ -9,8 +9,8 @@ * */ +#include "emu.h" #include "ps2sif.h" -#include "cpu/mips/ps2vu.h" DEFINE_DEVICE_TYPE(SONYPS2_SIF, ps2_sif_device, "ps2sif", "PlayStation 2 SIF") diff --git a/src/devices/machine/ps2sif.h b/src/devices/machine/ps2sif.h index 8a19586d502..a98a9c93485 100644 --- a/src/devices/machine/ps2sif.h +++ b/src/devices/machine/ps2sif.h @@ -14,7 +14,6 @@ #pragma once -#include "emu.h" #include "ps2intc.h" class ps2_sif_device : public device_t @@ -58,4 +57,4 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_SIF, ps2_sif_device) -#endif // DEVICES_MACHINE_PS2SIF_H \ No newline at end of file +#endif // DEVICES_MACHINE_PS2SIF_H diff --git a/src/devices/video/ps2gif.cpp b/src/devices/video/ps2gif.cpp index def4f08e17f..c4c714e7eb2 100644 --- a/src/devices/video/ps2gif.cpp +++ b/src/devices/video/ps2gif.cpp @@ -9,9 +9,8 @@ * */ +#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") diff --git a/src/devices/video/ps2gif.h b/src/devices/video/ps2gif.h index 2cd7215269e..29c57e80f2b 100644 --- a/src/devices/video/ps2gif.h +++ b/src/devices/video/ps2gif.h @@ -14,8 +14,6 @@ #pragma once -#include "emu.h" - class ps2_gs_device; class sonyvu1_device; @@ -127,4 +125,7 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_GIF, ps2_gif_device) -#endif // DEVICES_VIDEO_PS2GIF_H \ No newline at end of file +#include "ps2gs.h" +#include "cpu/mips/ps2vu.h" + +#endif // DEVICES_VIDEO_PS2GIF_H diff --git a/src/devices/video/ps2gs.cpp b/src/devices/video/ps2gs.cpp index c529d5891b5..2186d5033eb 100644 --- a/src/devices/video/ps2gs.cpp +++ b/src/devices/video/ps2gs.cpp @@ -9,9 +9,8 @@ * */ +#include "emu.h" #include "ps2gs.h" -#include "ps2gif.h" -#include "cpu/mips/ps2vu.h" DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS") @@ -752,4 +751,4 @@ READ32_MEMBER(ps2_gs_device::gif_r) WRITE32_MEMBER(ps2_gs_device::gif_w) { m_gif->write(space, offset, data, mem_mask); -} \ No newline at end of file +} diff --git a/src/devices/video/ps2gs.h b/src/devices/video/ps2gs.h index 5d7e2836763..1890ef5386f 100644 --- a/src/devices/video/ps2gs.h +++ b/src/devices/video/ps2gs.h @@ -14,9 +14,7 @@ #pragma once -#include "emu.h" -#include "machine/ps2intc.h" - +class ps2_intc_device; class ps2_gif_device; class sonyvu1_device; @@ -313,4 +311,8 @@ protected: DECLARE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device) -#endif // DEVICES_VIDEO_PS2GS_H \ No newline at end of file +#include "ps2gif.h" +#include "cpu/mips/ps2vu.h" +#include "machine/ps2intc.h" + +#endif // DEVICES_VIDEO_PS2GS_H -- cgit v1.2.3