Move a few odds and ends out of the emu core

scripts/src/emu.lua

@@ -163,8 +163,6 @@ files {
 	MAME_DIR .. "src/emu/sound.h",
 	MAME_DIR .. "src/emu/speaker.cpp",
 	MAME_DIR .. "src/emu/speaker.h",
-	MAME_DIR .. "src/emu/sprite.cpp",
-	MAME_DIR .. "src/emu/sprite.h",
 	MAME_DIR .. "src/emu/tilemap.cpp",
 	MAME_DIR .. "src/emu/tilemap.h",
 	MAME_DIR .. "src/emu/timer.cpp",
@@ -205,8 +203,6 @@ files {
 	MAME_DIR .. "src/emu/debug/express.h",
 	MAME_DIR .. "src/emu/debug/textbuf.cpp",
 	MAME_DIR .. "src/emu/debug/textbuf.h",
-	MAME_DIR .. "src/emu/sound/wavwrite.cpp",
-	MAME_DIR .. "src/emu/sound/wavwrite.h",
 	MAME_DIR .. "src/emu/drivers/empty.cpp",
 	MAME_DIR .. "src/emu/drivers/xtal.h",
 	MAME_DIR .. "src/emu/video/generic.cpp",

scripts/src/lib.lua

@@ -90,6 +90,8 @@ project "utils"
 		MAME_DIR .. "src/lib/util/vbiparse.cpp",
 		MAME_DIR .. "src/lib/util/vbiparse.h",
 		MAME_DIR .. "src/lib/util/vecstream.h",
+		MAME_DIR .. "src/lib/util/wavwrite.cpp",
+		MAME_DIR .. "src/lib/util/wavwrite.h",
 		MAME_DIR .. "src/lib/util/xmlfile.cpp",
 		MAME_DIR .. "src/lib/util/xmlfile.h",
 		MAME_DIR .. "src/lib/util/zippath.cpp",

scripts/src/video.lua

@@ -11,6 +11,8 @@
 
 files {
 	MAME_DIR .. "src/devices/video/poly.h",
+	MAME_DIR .. "src/devices/video/sprite.cpp",
+	MAME_DIR .. "src/devices/video/sprite.h",
 	MAME_DIR .. "src/devices/video/vector.cpp",
 	MAME_DIR .. "src/devices/video/vector.h",
 }

src/devices/sound/discrete.cpp

@@ -36,7 +36,7 @@
  ************************************************************************/
 
 #include "emu.h"
-#include "sound/wavwrite.h"
+#include "wavwrite.h"
 #include "discrete.h"
 #include <atomic>
 #include <iostream>

src/devices/sound/discrete.h

@@ -3467,8 +3467,6 @@
  *
  ************************************************************************/
 
-#include "sound/wavwrite.h"
-
 /*************************************
  *
  *  macros

src/devices/sound/gaelco.cpp

@@ -37,7 +37,7 @@ Registers per channel:
 
 #include "emu.h"
 #include "gaelco.h"
-#include "sound/wavwrite.h"
+#include "wavwrite.h"
 
 #define VERBOSE_SOUND 0
 #define VERBOSE_READ_WRITES 0

src/devices/sound/sn76477.cpp

@@ -38,7 +38,7 @@
  *****************************************************************************/
 
 #include "emu.h"
-#include "sound/wavwrite.h"
+#include "wavwrite.h"
 #include "sn76477.h"
 
 

src/emu/sound.cpp

@@ -12,7 +12,7 @@
 #include "emuopts.h"
 #include "osdepend.h"
 #include "config.h"
-#include "sound/wavwrite.h"
+#include "wavwrite.h"
 
 
 

src/lib/util/wavwrite.cpp

@@ -1,7 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Aaron Giles
-#include "emu.h"
+#include "osdcomm.h"
-#include "sound/wavwrite.h"
+#include "corealloc.h"
+#include <vector>
+#include "wavwrite.h"
 
 struct wav_file
 {

src/mame/video/atarimo.h

@@ -11,7 +11,7 @@
 #ifndef __ATARIMO__
 #define __ATARIMO__
 
-#include "sprite.h"
+#include "video/sprite.h"
 
 
 //**************************************************************************

src/mame/video/sega16sp.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "sprite.h"
+#include "video/sprite.h"
 #include "segaic16.h"
 
 #ifndef __SEGA16SP_H__