Initial shot at CMake project, dumped other project files. Work in pr…

…ogress.
icculus · Jul 14, 2018 · 3173ed9 · 3173ed9
1 parent 0a2f943
commit 3173ed9
Show file tree

Hide file tree

Showing 30 changed files with 84 additions and 1,757 deletions.
diff --git a/CWProject.sit b/CWProject.sit
diff --git a/Makefile.am b/Makefile.am
diff --git a/PBProjects.tar.gz b/PBProjects.tar.gz
diff --git a/SDL_sound.c b/SDL_sound.c
@@ -55,51 +55,40 @@ typedef struct
 
 static decoder_element decoders[] =
 {
-#if (defined SOUND_SUPPORTS_MODPLUG)
+#if SOUND_SUPPORTS_MODPLUG
     { 0, &__Sound_DecoderFunctions_MODPLUG },
 #endif
-
-#if (defined SOUND_SUPPORTS_MIKMOD)
+#if SOUND_SUPPORTS_MIKMOD
     { 0, &__Sound_DecoderFunctions_MIKMOD },
 #endif
-
-#if (defined SOUND_SUPPORTS_WAV)
+#if SOUND_SUPPORTS_WAV
     { 0, &__Sound_DecoderFunctions_WAV },
 #endif
-
-#if (defined SOUND_SUPPORTS_AIFF)
+#if SOUND_SUPPORTS_AIFF
     { 0, &__Sound_DecoderFunctions_AIFF },
 #endif
-
-#if (defined SOUND_SUPPORTS_AU)
+#if SOUND_SUPPORTS_AU
     { 0, &__Sound_DecoderFunctions_AU },
 #endif
-
-#if (defined SOUND_SUPPORTS_OGG)
+#if SOUND_SUPPORTS_OGG
     { 0, &__Sound_DecoderFunctions_OGG },
 #endif
-
-#if (defined SOUND_SUPPORTS_VOC)
+#if SOUND_SUPPORTS_VOC
     { 0, &__Sound_DecoderFunctions_VOC },
 #endif
-
-#if (defined SOUND_SUPPORTS_RAW)
+#if SOUND_SUPPORTS_RAW
     { 0, &__Sound_DecoderFunctions_RAW },
 #endif
-
-#if (defined SOUND_SUPPORTS_SHN)
+#if SOUND_SUPPORTS_SHN
     { 0, &__Sound_DecoderFunctions_SHN },
 #endif
-
-#if (defined SOUND_SUPPORTS_FLAC)
+#if SOUND_SUPPORTS_FLAC
     { 0, &__Sound_DecoderFunctions_FLAC },
 #endif
-
-#if (defined SOUND_SUPPORTS_SPEEX)
+#if SOUND_SUPPORTS_SPEEX
     { 0, &__Sound_DecoderFunctions_SPEEX },
 #endif
-
-#if (defined SOUND_SUPPORTS_COREAUDIO)
+#if SOUND_SUPPORTS_COREAUDIO
     { 0, &__Sound_DecoderFunctions_CoreAudio },
 #endif
 

diff --git a/SDL_sound_internal.h b/SDL_sound_internal.h
@@ -18,7 +18,12 @@
 #error Do not include this header from your applications.
 #endif
 
-#include "SDL.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "SDL_sound.h"
 
 /* SDL 1.2.4 defines this, but better safe than sorry. */
 #if (!defined(__inline__))
@@ -50,6 +55,44 @@
 #endif
 
 
+#ifndef SOUND_SUPPORTS_MODPLUG
+#define SOUND_SUPPORTS_MODPLUG 1
+#endif
+#ifndef SOUND_SUPPORTS_MIKMOD
+#define SOUND_SUPPORTS_MIKMOD 1
+#endif
+#ifndef SOUND_SUPPORTS_WAV
+#define SOUND_SUPPORTS_WAV 1
+#endif
+#ifndef SOUND_SUPPORTS_AIFF
+#define SOUND_SUPPORTS_AIFF 1
+#endif
+#ifndef SOUND_SUPPORTS_AU
+#define SOUND_SUPPORTS_AU 1
+#endif
+#ifndef SOUND_SUPPORTS_OGG
+#define SOUND_SUPPORTS_OGG 1
+#endif
+#ifndef SOUND_SUPPORTS_VOC
+#define SOUND_SUPPORTS_VOC 1
+#endif
+#ifndef SOUND_SUPPORTS_RAW
+#define SOUND_SUPPORTS_RAW 1
+#endif
+#ifndef SOUND_SUPPORTS_SHN
+#define SOUND_SUPPORTS_SHN 1
+#endif
+#ifndef SOUND_SUPPORTS_FLAC
+#define SOUND_SUPPORTS_FLAC 1
+#endif
+#ifndef SOUND_SUPPORTS_SPEEX
+#define SOUND_SUPPORTS_SPEEX 1
+#endif
+#ifndef SOUND_SUPPORTS_COREAUDIO
+#define SOUND_SUPPORTS_COREAUDIO 1
+#endif
+
+
 /*
  * SDL itself only supports mono and stereo output, but hopefully we can
  *  raise this value someday...there's probably a lot of assumptions in

diff --git a/VisualC/README.txt b/VisualC/README.txt
diff --git a/VisualC/playsound.dsp b/VisualC/playsound.dsp