summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2016-04-23 15:27:59 -0400
committer AJR <ajrhacker@users.noreply.github.com>2016-04-23 15:27:59 -0400
commitfb08fefaee1519d31241cdb614c411945e53cd46 (patch)
treefc01534036f0eac98a97a08ff59994cb5be14bf8
parent9c81ead8b05677438b4a871c03f0a7101930b712 (diff)
Move a few odds and ends out of the emu core
-rw-r--r--scripts/src/emu.lua4
-rw-r--r--scripts/src/lib.lua2
-rw-r--r--scripts/src/video.lua2
-rw-r--r--src/devices/sound/discrete.cpp2
-rw-r--r--src/devices/sound/discrete.h2
-rw-r--r--src/devices/sound/gaelco.cpp2
-rw-r--r--src/devices/sound/sn76477.cpp2
-rw-r--r--src/devices/video/sprite.cpp (renamed from src/emu/sprite.cpp)0
-rw-r--r--src/devices/video/sprite.h (renamed from src/emu/sprite.h)0
-rw-r--r--src/emu/sound.cpp2
-rw-r--r--src/lib/util/wavwrite.cpp (renamed from src/emu/sound/wavwrite.cpp)6
-rw-r--r--src/lib/util/wavwrite.h (renamed from src/emu/sound/wavwrite.h)0
-rw-r--r--src/mame/video/atarimo.h2
-rw-r--r--src/mame/video/sega16sp.h2
14 files changed, 14 insertions, 14 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 373aa92d5fc..2fdefe75e3e 100644
--- a/scripts/src/emu.lua
+++ b/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",
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 3c84b7a9ac9..080aa707153 100644
--- a/scripts/src/lib.lua
+++ b/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",
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index cf7f49b4531..984bac6a950 100644
--- a/scripts/src/video.lua
+++ b/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",
}
diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp
index e09c47c9bf0..e15e033a0fa 100644
--- a/src/devices/sound/discrete.cpp
+++ b/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>
diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h
index e5145b39132..ac20e25cfab 100644
--- a/src/devices/sound/discrete.h
+++ b/src/devices/sound/discrete.h
@@ -3467,8 +3467,6 @@
*
************************************************************************/
-#include "sound/wavwrite.h"
-
/*************************************
*
* macros
diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp
index 141361499c8..c86a30a3ca8 100644
--- a/src/devices/sound/gaelco.cpp
+++ b/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
diff --git a/src/devices/sound/sn76477.cpp b/src/devices/sound/sn76477.cpp
index e1fe3f4d3fc..111e127aa82 100644
--- a/src/devices/sound/sn76477.cpp
+++ b/src/devices/sound/sn76477.cpp
@@ -38,7 +38,7 @@
*****************************************************************************/
#include "emu.h"
-#include "sound/wavwrite.h"
+#include "wavwrite.h"
#include "sn76477.h"
diff --git a/src/emu/sprite.cpp b/src/devices/video/sprite.cpp
index 7567f0dd0ac..7567f0dd0ac 100644
--- a/src/emu/sprite.cpp
+++ b/src/devices/video/sprite.cpp
diff --git a/src/emu/sprite.h b/src/devices/video/sprite.h
index f10537f9900..f10537f9900 100644
--- a/src/emu/sprite.h
+++ b/src/devices/video/sprite.h
diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp
index 799ea4f1fc5..194c98c7190 100644
--- a/src/emu/sound.cpp
+++ b/src/emu/sound.cpp
@@ -12,7 +12,7 @@
#include "emuopts.h"
#include "osdepend.h"
#include "config.h"
-#include "sound/wavwrite.h"
+#include "wavwrite.h"
diff --git a/src/emu/sound/wavwrite.cpp b/src/lib/util/wavwrite.cpp
index 173962ea46c..7172873a14d 100644
--- a/src/emu/sound/wavwrite.cpp
+++ b/src/lib/util/wavwrite.cpp
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-#include "emu.h"
-#include "sound/wavwrite.h"
+#include "osdcomm.h"
+#include "corealloc.h"
+#include <vector>
+#include "wavwrite.h"
struct wav_file
{
diff --git a/src/emu/sound/wavwrite.h b/src/lib/util/wavwrite.h
index 376856fb16f..376856fb16f 100644
--- a/src/emu/sound/wavwrite.h
+++ b/src/lib/util/wavwrite.h
diff --git a/src/mame/video/atarimo.h b/src/mame/video/atarimo.h
index 0d3b54f6f38..5a1aa512d7a 100644
--- a/src/mame/video/atarimo.h
+++ b/src/mame/video/atarimo.h
@@ -11,7 +11,7 @@
#ifndef __ATARIMO__
#define __ATARIMO__
-#include "sprite.h"
+#include "video/sprite.h"
//**************************************************************************
diff --git a/src/mame/video/sega16sp.h b/src/mame/video/sega16sp.h
index e5f50143ba1..e5a05083e36 100644
--- a/src/mame/video/sega16sp.h
+++ b/src/mame/video/sega16sp.h
@@ -8,7 +8,7 @@
#pragma once
-#include "sprite.h"
+#include "video/sprite.h"
#include "segaic16.h"
#ifndef __SEGA16SP_H__