r277 - in trunk: . code/unix

[DONOTREPLY at icculus.org]

Author: tma
Date: 2005-11-04 20:06:09 -0500 (Fri, 04 Nov 2005)
New Revision: 277

Modified:
   trunk/code/unix/Makefile
   trunk/i_o-q3-readme
Log:
* Patch from vapier that aids packaging
* Truth value of USE_SDL changed to 1 from true, for consistency


Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2005-11-05 01:03:32 UTC (rev 276)
+++ trunk/code/unix/Makefile	2005-11-05 01:06:09 UTC (rev 277)
@@ -50,9 +50,17 @@
 endif
 
 ifndef USE_SDL
-USE_SDL=true
+USE_SDL=1
 endif
 
+ifndef BUILD_CLIENT
+BUILD_CLIENT=1
+endif
+
+ifndef BUILD_SERVER
+BUILD_SERVER=1
+endif
+
 #############################################################################
 
 BD=debug$(ARCH)$(GLIBC)
@@ -113,7 +121,7 @@
 
   BASE_CFLAGS = -pipe -Wall -fno-strict-aliasing
 
-  ifeq ($(strip $(USE_SDL)),true)
+  ifeq ($(USE_SDL),1)
     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
     GL_CFLAGS =
   else
@@ -158,7 +166,7 @@
   THREAD_LDFLAGS=-lpthread
   LDFLAGS=-ldl -lm
 
-  ifeq ($(strip $(USE_SDL)),true)
+  ifeq ($(USE_SDL),1)
     GLLDFLAGS=$(shell sdl-config --libs)
   else
     GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
@@ -382,7 +390,7 @@
 
   BASE_CFLAGS = -pipe -Wall -fno-strict-aliasing
 
-  ifeq ($(strip $(USE_SDL)),true)
+  ifeq ($(USE_SDL),1)
     BASE_CFLAGS += -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
     GL_CFLAGS =
   else
@@ -415,7 +423,7 @@
   THREAD_LDFLAGS=-lpthread
   LDFLAGS=-lsocket -lnsl -ldl -lm
 
-  ifeq ($(strip $(USE_SDL)),true)
+  ifeq ($(USE_SDL),1)
     GLLDFLAGS=$(shell sdl-config --libs) -L/usr/X11/lib -lGLU -lX11 -lXext
   else
     GLLDFLAGS=-L/usr/openwin/$(LIB) -L/usr/X11/lib -lGLU -lX11 -lXext
@@ -488,6 +496,24 @@
 endif #IRIX
 endif #SunOS
 
+ifneq ($(BUILD_SERVER),1)
+  TARGETS := $(subst $(B)/$(PLATFORM)q3ded,,$(TARGETS))
+endif
+
+ifneq ($(BUILD_CLIENT),1)
+  TARGETS := \
+	$(subst $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT),,\
+	$(subst $(B)/baseq3/ui$(ARCH).$(SHLIBEXT),,\
+	$(subst $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT),,\
+	$(subst $(B)/missionpack/ui$(ARCH).$(SHLIBEXT),,\
+	$(subst $(B)/baseq3/vm/cgame.qvm,,\
+	$(subst $(B)/baseq3/vm/ui.qvm,,\
+	$(subst $(B)/missionpack/vm/cgame.qvm,,\
+	$(subst $(B)/missionpack/vm/ui.qvm,,\
+	$(subst $(B)/$(PLATFORM)quake3-smp$(BINEXT),,\
+	$(subst $(B)/$(PLATFORM)quake3$(BINEXT),,$(TARGETS) ))))))))))
+endif
+
 ifdef DEFAULT_BASEDIR
   BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
 endif

Modified: trunk/i_o-q3-readme
===================================================================
--- trunk/i_o-q3-readme	2005-11-05 01:03:32 UTC (rev 276)
+++ trunk/i_o-q3-readme	2005-11-05 01:06:09 UTC (rev 277)
@@ -41,6 +41,11 @@
 1. If not already there, change to the directory containing this readme
 2. Run 'make'
 
+For distro maintainers, you can set some make variables:
+ DEFAULT_BASEDIR - extra path to search for baseq3 and such
+ BUILD_SERVER    - build the 'q3ded' server binary (1 = build it, default = 1)
+ BUILD_CLIENT    - build the 'quake3' client binary (1 = build it, default = 1)
+
 Installing under Linux
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Set the COPYDIR variable in the shell to be where you installed