aboutsummaryrefslogtreecommitdiff
path: root/sound/softsynth/opl
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-06 20:19:47 +0000
committerJohannes Schickel2009-05-06 20:19:47 +0000
commitb33bf76c70bfaa9933c8c9bb12eb6d29d5cb2a88 (patch)
treef2aa8ee4e7aff532969fef506b590e3524d4a202 /sound/softsynth/opl
parent262363f2b3383f506f6e43838eae8b4b3ea78e30 (diff)
downloadscummvm-rg350-b33bf76c70bfaa9933c8c9bb12eb6d29d5cb2a88.tar.gz
scummvm-rg350-b33bf76c70bfaa9933c8c9bb12eb6d29d5cb2a88.tar.bz2
scummvm-rg350-b33bf76c70bfaa9933c8c9bb12eb6d29d5cb2a88.zip
For the time being rename opl.h to opl_inc.h and opl.cpp to opl_impl.h, so MSVC does not try to compile the former opl.cpp. (Needs cleanup in the future anyway...)
svn-id: r40365
Diffstat (limited to 'sound/softsynth/opl')
-rw-r--r--sound/softsynth/opl/dosbox.cpp4
-rw-r--r--sound/softsynth/opl/opl_impl.h (renamed from sound/softsynth/opl/opl.cpp)2
-rw-r--r--sound/softsynth/opl/opl_inc.h (renamed from sound/softsynth/opl/opl.h)0
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/softsynth/opl/dosbox.cpp b/sound/softsynth/opl/dosbox.cpp
index ae1499ef49..db8f8109d7 100644
--- a/sound/softsynth/opl/dosbox.cpp
+++ b/sound/softsynth/opl/dosbox.cpp
@@ -145,7 +145,7 @@ uint8 Chip::read() {
}
namespace OPL2 {
-#include "opl.cpp"
+#include "opl_impl.h"
struct Handler : public DOSBox::Handler {
void writeReg(uint32 reg, uint8 val) {
@@ -168,7 +168,7 @@ struct Handler : public DOSBox::Handler {
namespace OPL3 {
#define OPLTYPE_IS_OPL3
-#include "opl.cpp"
+#include "opl_impl.h"
struct Handler : public DOSBox::Handler {
void writeReg(uint32 reg, uint8 val) {
diff --git a/sound/softsynth/opl/opl.cpp b/sound/softsynth/opl/opl_impl.h
index 416f38a8ce..4ea8793965 100644
--- a/sound/softsynth/opl/opl.cpp
+++ b/sound/softsynth/opl/opl_impl.h
@@ -24,7 +24,7 @@
* Ken Silverman's official web site: "http://www.advsys.net/ken"
*/
-#include "opl.h"
+#include "opl_inc.h"
static fltype recipsamp; // inverse of sampling rate
diff --git a/sound/softsynth/opl/opl.h b/sound/softsynth/opl/opl_inc.h
index 0798bd9f6a..0798bd9f6a 100644
--- a/sound/softsynth/opl/opl.h
+++ b/sound/softsynth/opl/opl_inc.h