Moved the APU files up by one level, since they are shared between the GB and GBA cores.

CMakeLists.txt

@@ -156,12 +156,15 @@ SET(SRC_DMG
     src/dmg/gbPrinter.cpp
     src/dmg/gbSGB.cpp
     src/dmg/gbSound.cpp
-    src/dmg/gb_apu/Blip_Buffer.cpp
+)
-    src/dmg/gb_apu/Effects_Buffer.cpp
+
-    src/dmg/gb_apu/Gb_Apu.cpp
+SET(SRC_APU
-    src/dmg/gb_apu/Gb_Apu_State.cpp
+    src/apu/Blip_Buffer.cpp
-    src/dmg/gb_apu/Gb_Oscs.cpp
+    src/apu/Effects_Buffer.cpp
-    src/dmg/gb_apu/Multi_Buffer.cpp
+    src/apu/Gb_Apu.cpp
+    src/apu/Gb_Apu_State.cpp
+    src/apu/Gb_Oscs.cpp
+    src/apu/Multi_Buffer.cpp
 )
 
 SET(SRC_SDL
@@ -267,6 +270,7 @@ ADD_LIBRARY (
     ${SRC_MAIN}
     ${SRC_AGB}
     ${SRC_DMG}
+    ${SRC_APU}
     ${SRC_FEX_MINI}
     ${SRC_FILTERS}
     ${SRC_DEBUGGER}

src/Sound.cpp

@@ -7,8 +7,8 @@
 #include "Util.h"
 #include "common/Port.h"
 
-#include "dmg/gb_apu/Gb_Apu.h"
+#include "apu/Gb_Apu.h"
-#include "dmg/gb_apu/Multi_Buffer.h"
+#include "apu/Multi_Buffer.h"
 
 #include "common/SoundDriver.h"
 

src/dmg/gbSound.cpp

@@ -5,8 +5,8 @@
 #include "gbGlobals.h"
 #include "gbSound.h"
 
-#include "gb_apu/Gb_Apu.h"
+#include "../apu/Gb_Apu.h"
-#include "gb_apu/Effects_Buffer.h"
+#include "../apu/Effects_Buffer.h"
 
 extern int gbHardware;
 extern long soundSampleRate; // current sound quality