ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Patch from vapier that aids packaging

Browse source 
* Truth value of USE_SDL changed to 1 from true, for consistency
This commit is contained in:
Tim Angus 2005-11-05 01:06:09 +00:00
parent d41de844d3
commit fe09cd3217
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
code/unix/Makefile
View file

@ -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

5
i_o-q3-readme
View file

@ -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