Clear up CYCLE_ACCURATE confusion. Rename dsp.* to sdsp.*.

2011-06-25 03:10:42 -05:00 · 2011-06-25 03:10:42 -05:00 · 2e94b98e90
parent 7963d0e66b
commit 2e94b98e90
5 changed files with 2 additions and 6 deletions
--- a/apu/bapu/dsp/sdsp.cpp
+++ b/apu/bapu/dsp/sdsp.cpp
--- a/apu/bapu/dsp/sdsp.hpp
+++ b/apu/bapu/dsp/sdsp.hpp
--- 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>

--- 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
 {
--- 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