From: molivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 23 Jun 2004 14:11:05 +0000 (+0000)
Subject: Oops. I involuntary changed the default Linux sound config from OSS to ALSA 2 months... 
X-Git-Tag: xonotic-v0.1.0preview~5810
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=47ed611b7c239ce8b688340842f59fc712108d30;p=xonotic%2Fdarkplaces.git

Oops. I involuntary changed the default Linux sound config from OSS to ALSA 2 months ago. Reverted back that change.


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4250 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/makefile.inc b/makefile.inc
index bd483b6a..9eb9e709 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -145,11 +145,11 @@ CMD_UNIXRM=rm -rf
 ##### Linux specific variables #####
 
 # Recommended for: anyone not using ALSA
-#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
-#LIB_LINUXSOUND=
+OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
+LIB_LINUXSOUND=
 # Recommended for: anyone using ALSA
-OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o
-LIB_LINUXSOUND=-lasound
+#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o
+#LIB_LINUXSOUND=-lasound
 # Recommended for: anyone who can't use the above drivers
 #OBJ_LINUXSOUND=$(OBJ_NOSOUND)
 #LIB_LINUXSOUND=