From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 10 Jun 2001 20:03:42 +0000 (+0000)
Subject: added -lz to the non-ALSA compile line, switched to non-ALSA compile by default ... 
X-Git-Tag: RELEASE_0_2_0_RC1~797
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de9d94a6f5031904907c2fb5d022086d8124dcfd;p=xonotic%2Fdarkplaces.git

added -lz to the non-ALSA compile line, switched to non-ALSA compile by default (to match the sound driver default being non-ALSA)
added a lot of descriptive comments


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

diff --git a/makefile b/makefile
index d7bd9441..b39f6ca5 100644
--- a/makefile
+++ b/makefile
@@ -11,10 +11,20 @@ OBJECTS= buildnumber.o cd_linux.o chase.o cl_demo.o cl_input.o cl_main.o cl_pars
 OPTIMIZATIONS= -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
 #OPTIMIZATIONS= -O -g
 
+#note:
+#the -Werror can be removed to compile even if there are warnings,
+#the Quakeforge team uses this to ensure that all released versions are free
+#of warnings.
+
+#normal compile
 CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -I/usr/include/glide $(OPTIMIZATIONS)
+#debug compile
 #CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -ggdb $(OPTIMIZATIONS)
-#LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl
-LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl -lasound -lz
+
+#if using oss or kernel sound driver, use this line
+LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl -lz
+#if using alsa, use this line
+#LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl -lasound -lz
 
 #most people can't build the -3dfx version (-3dfx version needs some updates for new mesa)
 all: darkplaces-glx