From 2e94b98e904dcc1441087007b46f290c5dc08225 Mon Sep 17 00:00:00 2001
From: Brandon Wright <bearoso@gmail.com>
Date: Sat, 25 Jun 2011 03:10:42 -0500
Subject: [PATCH] Clear up CYCLE_ACCURATE confusion. Rename dsp.* to sdsp.*.

---
 apu/bapu/dsp/{dsp.cpp => sdsp.cpp} | 0
 apu/bapu/dsp/{dsp.hpp => sdsp.hpp} | 0
 apu/bapu/smp/smp.cpp               | 4 ----
 apu/bapu/snes/snes.hpp             | 2 +-
 gtk/Makefile.am                    | 2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)
 rename apu/bapu/dsp/{dsp.cpp => sdsp.cpp} (100%)
 rename apu/bapu/dsp/{dsp.hpp => sdsp.hpp} (100%)

diff --git a/apu/bapu/dsp/dsp.cpp b/apu/bapu/dsp/sdsp.cpp
similarity index 100%
rename from apu/bapu/dsp/dsp.cpp
rename to apu/bapu/dsp/sdsp.cpp
diff --git a/apu/bapu/dsp/dsp.hpp b/apu/bapu/dsp/sdsp.hpp
similarity index 100%
rename from apu/bapu/dsp/dsp.hpp
rename to apu/bapu/dsp/sdsp.hpp
diff --git a/apu/bapu/smp/smp.cpp b/apu/bapu/smp/smp.cpp
index e0bb9019..a8092fcb 100644
--- a/apu/bapu/smp/smp.cpp
+++ b/apu/bapu/smp/smp.cpp
@@ -1,8 +1,4 @@
-#ifndef SNES9X
 #define CYCLE_ACCURATE
-#else
-#undef CYCLE_ACCURATE
-#endif
 
 #include <snes/snes.hpp>
 
diff --git a/apu/bapu/snes/snes.hpp b/apu/bapu/snes/snes.hpp
index 58a2d8a0..3e8cd2b3 100644
--- a/apu/bapu/snes/snes.hpp
+++ b/apu/bapu/snes/snes.hpp
@@ -28,7 +28,7 @@ struct Processor
 };
 
 #include "smp/smp.hpp"
-#include "dsp/dsp.hpp"
+#include "dsp/sdsp.hpp"
 
 class CPU
 {
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 85ee9055..9f380914 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -123,7 +123,7 @@ snes9x_gtk_SOURCES += \
     
 # Byuu's APU
 snes9x_gtk_SOURCES += \
-    ../apu/bapu/dsp/dsp.cpp \
+    ../apu/bapu/dsp/sdsp.cpp \
     ../apu/bapu/dsp/SPC_DSP.cpp \
     ../apu/bapu/smp/smp.cpp \
     ../apu/bapu/smp/smp_state.cpp