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

scripts/build/makedep.py

@@ -160,7 +160,9 @@ def parse_file(root, srcfile, folder):
                    files_included.append(fullname)
                    newfolder = fullname.rsplit('/', 1)[0] + '/'
                    parse_file(root, fullname, newfolder)
-                   if (fullname.endswith('.h')):
+                   if (fullname.endswith('.h') and not("src/emu" in fullname) and not("src/devices" in fullname) and not("src/lib" in fullname) and not("src/osd" in fullname)):
+                       parse_file_for_deps(root, fullname.replace('.h','.cpp'), newfolder)
+                   elif fullname.endswith('.h'):
                        parse_file(root, fullname.replace('.h','.cpp'), newfolder)
                continue
     fp.close()

src/mame/video/pc080sn.cpp

@@ -43,6 +43,7 @@ Control registers
 
 #include "emu.h"
 #include "pc080sn.h"
+#include "video/taito_helper.h"
 
 #define PC080SN_RAM_SIZE 0x10000
 #define TOPSPEED_ROAD_COLORS

src/mame/video/pc080sn.h

@@ -3,8 +3,6 @@
 #ifndef __PC080SN_H__
 #define __PC080SN_H__
 
-#include "video/taito_helper.h"
-
 class pc080sn_device : public device_t
 {
 public:

src/mame/video/tc0080vco.cpp

@@ -63,6 +63,7 @@ this seems to be the only zoom feature actually used in the games.
 #include "emu.h"
 #include "drawgfxm.h"
 #include "tc0080vco.h"
+#include "video/taito_helper.h"
 
 #define TC0080VCO_RAM_SIZE 0x21000
 #define TC0080VCO_CHAR_RAM_SIZE 0x2000

src/mame/video/tc0080vco.h

@@ -3,8 +3,6 @@
 #ifndef __TC0080VCO_H__
 #define __TC0080VCO_H__
 
-#include "video/taito_helper.h"
-
 class tc0080vco_device : public device_t
 {
 public:

src/mame/video/tc0150rod.cpp

@@ -8,6 +8,7 @@ Road generator. Two roads allow for forking. Gfx data fetched from ROM. Refer to
 
 #include "emu.h"
 #include "tc0150rod.h"
+#include "video/taito_helper.h"
 
 #define TC0150ROD_RAM_SIZE 0x2000
 

src/mame/video/tc0150rod.h

@@ -3,8 +3,6 @@
 #ifndef __TC0150ROD_H__
 #define __TC0150ROD_H__
 
-#include "video/taito_helper.h"
-
 class tc0150rod_device : public device_t
 {
 public:

src/mame/video/tc0480scp.cpp

@@ -143,6 +143,7 @@ Control registers
 
 #include "emu.h"
 #include "tc0480scp.h"
+#include "video/taito_helper.h"
 
 #define TC0480SCP_RAM_SIZE 0x10000
 #define TC0480SCP_TOTAL_CHARS 256

src/mame/video/tc0480scp.h

@@ -3,8 +3,6 @@
 #ifndef __TC0480SCP_H__
 #define __TC0480SCP_H__
 
-#include "video/taito_helper.h"
-
 class tc0480scp_device : public device_t
 {
 public: