Fixes for compilation under MinGW.

[thunder] / src / sound.cpp

diff --git a/src/sound.cpp b/src/sound.cpp
index 3be768305629b37a3d8e8d7d8ff38e67ede1297d..8d87ad9ea12b14f086df6be0e6ca16a045859219 100644 (file)
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -12,7 +12,7 @@
 //
 
 #include "sound.h"
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "psg.h"
 #include "resource.h"
 #include "ym2151.h"
@@ -69,6 +69,7 @@ void InitSound(void)
        desired.samples = 1024;
        desired.callback = SoundFunc;
        desired.userdata = NULL;
+
        // Also, should check to see if it got the hardware it needed, correct sample size, etc.
        if (SDL_OpenAudio(&desired, &obtained) < 0)
        {
@@ -85,8 +86,8 @@ void InitSound(void)
 
 void SpawnSound(int type, int snd, int channel/* = 0*/)
 {
-       extern uint32_t psg_lens[16];
-       extern uint8_t * psg_adrs[16];
+//     extern uint32_t psg_lens[16];
+//     extern uint8_t * psg_adrs[16];
 //     extern uint32_t voc_lens[32];
 //     extern uint8_t * voc_adrs[32];
 //     extern uint32_t fm_lens[14];