diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-05 01:06:09 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-05 01:06:09 +0000 |
| commit | 3919b6dc6dc82b1d4f605301c9d9b81f18c627b7 (patch) | |
| tree | e7b2dfd29e1304d8577b586031c0d014e007bacd | |
| parent | 1fa110cf268a6d3712ca57e77177caec6756772a (diff) | |
| download | ioquake3-aero-3919b6dc6dc82b1d4f605301c9d9b81f18c627b7.tar.gz ioquake3-aero-3919b6dc6dc82b1d4f605301c9d9b81f18c627b7.zip | |
* Patch from vapier that aids packaging
* Truth value of USE_SDL changed to 1 from true, for consistency
git-svn-id: svn://svn.icculus.org/quake3/trunk@277 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/unix/Makefile | 36 | ||||
| -rw-r--r-- | i_o-q3-readme | 5 |
2 files changed, 36 insertions, 5 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile index c048426..70c6a56 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -50,7 +50,15 @@ DXSDK_DIR=C:/DXSDK 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 ############################################################################# @@ -113,7 +121,7 @@ ifeq ($(PLATFORM),linux) 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 @@ ifeq ($(PLATFORM),linux) 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 @@ ifeq ($(PLATFORM),SunOS) 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 @@ ifeq ($(PLATFORM),SunOS) 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 #FreeBSD 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 diff --git a/i_o-q3-readme b/i_o-q3-readme index ba5ad89..66b186a 100644 --- a/i_o-q3-readme +++ b/i_o-q3-readme @@ -41,6 +41,11 @@ Compiling (Under Linux) 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 |