From 4f4ac0a66ec1af449b9bd0adde7fccc23d45fcd9 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 29 Jan 2001 13:53:28 +0000
Subject: [PATCH] Fixed build, minor fixes

---
 sound/Makefile.am | 13 +++++++++----
 sound/dos_cdrom.c | 19 +++++++++++++++----
 sound/dos_digi.c  | 17 +++++++++++++----
 sound/sdl_cdrom.c | 18 ++++++++++++++----
 sound/sdl_digi.c  | 16 ++++++++++++----
 5 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/sound/Makefile.am b/sound/Makefile.am
index 86ac0252..6f86f575 100644
--- a/sound/Makefile.am
+++ b/sound/Makefile.am
@@ -1,6 +1,11 @@
-noinst_LIBRARIES = libsound.a
 INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main
 
-libsound_a_SOURCES = \
-sdl_digi.c sdl_cdrom.c \
-dos_digi.c dos_cdrom.c
+noinst_LIBRARIES = libsound.a
+
+if ENV_DJGPP
+libsound_a_SOURCES = dos_digi.c dos_cdrom.c
+else
+libsound_a_SOURCES = sdl_digi.c sdl_cdrom.c
+endif
+
+EXTRA_libsound_a_SOURCES = sdl_digi.c sdl_cdrom.c dos_digi.c dos_cdrom.c
diff --git a/sound/dos_cdrom.c b/sound/dos_cdrom.c
index b812a850..66d26bae 100644
--- a/sound/dos_cdrom.c
+++ b/sound/dos_cdrom.c
@@ -1,6 +1,19 @@
-/* DPH: This is the file where all the stub functions go. The aim is to have nothing in here ,eventually */
+/*
+ * $Source: /cvs/cvsroot/d2x/sound/dos_cdrom.c,v $
+ * $Revision: 1.2 $
+ * $Author: bradleyb $
+ * $Date: 2001-01-29 13:53:28 $
+ *
+ * DPH: This is the file where all the stub functions go.
+ * The aim is to have nothing in here, eventually
+ *
+ * $Log: not supported by cvs2svn $
+ */
+
+#ifdef HAVE_CONFIG_H
 #include <conf.h>
-#ifdef __ENV_DJGPP__
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "pstypes.h"
@@ -76,5 +89,3 @@ int CD_blast_mixer()
 {
  return 0;
 }
-
-#endif // __ENV_DJGPP__
diff --git a/sound/dos_digi.c b/sound/dos_digi.c
index f0e17444..7d0ba6b2 100644
--- a/sound/dos_digi.c
+++ b/sound/dos_digi.c
@@ -1,7 +1,18 @@
-// SDL digital audio support
+/*
+ * $Source: /cvs/cvsroot/d2x/sound/dos_digi.c,v $
+ * $Revision: 1.2 $
+ * $Author: bradleyb $
+ * $Date: 2001-01-29 13:53:28 $
+ *
+ * DOS digital audio support
+ *
+ * $Log: not supported by cvs2svn $
+ */
 
+#ifdef HAVE_CONFIG_H
 #include <conf.h>
-#ifdef __ENV_DJGPP__
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -809,5 +820,3 @@ void digi_reset_digi_sounds() {
 //#endif
 //}
 //end this section kill - MM
-
-#endif // __ENV_DJGPP__
diff --git a/sound/sdl_cdrom.c b/sound/sdl_cdrom.c
index e8d80734..2187feb0 100644
--- a/sound/sdl_cdrom.c
+++ b/sound/sdl_cdrom.c
@@ -1,7 +1,19 @@
-/* DPH: This is the file where all the stub functions go. The aim is to have nothing in here ,eventually */
+/*
+ * $Source: /cvs/cvsroot/d2x/sound/sdl_cdrom.c,v $
+ * $Revision: 1.3 $
+ * $Author: bradleyb $
+ * $Date: 2001-01-29 13:53:28 $
+ *
+ * DPH: This is the file where all the stub functions go.
+ * The aim is to have nothing in here, eventually
+ *
+ * $Log: not supported by cvs2svn $
+ */
+
+#ifdef HAVE_CONFIG_H
 #include <conf.h>
+#endif
 
-#ifdef SDL_AUDIO
 #include <stdio.h>
 #include <stdlib.h>
 #include <SDL/SDL.h>
@@ -120,5 +132,3 @@ int CD_blast_mixer()
 {
  return 0;
 }
-
-#endif //SDL_AUDIO
diff --git a/sound/sdl_digi.c b/sound/sdl_digi.c
index 940967c5..08162b83 100644
--- a/sound/sdl_digi.c
+++ b/sound/sdl_digi.c
@@ -1,8 +1,18 @@
-// SDL digital audio support
+/*
+ * $Source: /cvs/cvsroot/d2x/sound/sdl_digi.c,v $
+ * $Revision: 1.2 $
+ * $Author: bradleyb $
+ * $Date: 2001-01-29 13:53:28 $
+ *
+ * SDL digital audio support
+ *
+ * $Log: not supported by cvs2svn $
+ */
 
+#ifdef HAVE_CONFIG_H
 #include <conf.h>
+#endif
 
-#ifdef SDL_AUDIO
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -842,5 +852,3 @@ void digi_reset_digi_sounds() {
 //#endif
 //}
 //end this section kill - MM
-
-#endif // SDL_AUDIO
-- 
2.39.2