2011-02-18 14:31:32 +00:00
|
|
|
#
|
|
|
|
# Q3Rally Makefile
|
|
|
|
#
|
|
|
|
# GNU Make required
|
|
|
|
#
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g')
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
|
|
|
|
|
|
|
|
ifeq ($(COMPILE_PLATFORM),sunos)
|
|
|
|
# Solaris uname and GNU uname differ
|
|
|
|
COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
|
|
|
|
endif
|
|
|
|
ifeq ($(COMPILE_PLATFORM),darwin)
|
|
|
|
# Apple does some things a little differently...
|
|
|
|
COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(COMPILE_PLATFORM),mingw32)
|
|
|
|
ifeq ($(COMPILE_ARCH),i386)
|
|
|
|
COMPILE_ARCH=x86
|
|
|
|
endif
|
2011-08-10 22:10:14 +00:00
|
|
|
ifeq ($(COMPILE_ARCH),x86_64)
|
|
|
|
COMPILE_ARCH=x64
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef BUILD_STANDALONE
|
|
|
|
BUILD_STANDALONE = 1
|
|
|
|
endif
|
|
|
|
ifndef BUILD_CLIENT
|
|
|
|
BUILD_CLIENT =
|
|
|
|
endif
|
|
|
|
ifndef BUILD_CLIENT_SMP
|
|
|
|
BUILD_CLIENT_SMP =
|
|
|
|
endif
|
|
|
|
ifndef BUILD_SERVER
|
|
|
|
BUILD_SERVER =
|
|
|
|
endif
|
|
|
|
ifndef BUILD_GAME_SO
|
|
|
|
BUILD_GAME_SO =
|
|
|
|
endif
|
|
|
|
ifndef BUILD_GAME_QVM
|
|
|
|
BUILD_GAME_QVM =
|
|
|
|
endif
|
2011-12-10 00:15:42 +00:00
|
|
|
ifndef BUILD_BASEGAME
|
|
|
|
BUILD_BASEGAME =
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
ifndef BUILD_MISSIONPACK
|
|
|
|
BUILD_MISSIONPACK= 0
|
|
|
|
endif
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
ifndef BUILD_RENDERER_REND2
|
|
|
|
BUILD_RENDERER_REND2=
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifneq ($(PLATFORM),darwin)
|
|
|
|
BUILD_CLIENT_SMP = 0
|
|
|
|
endif
|
|
|
|
|
2011-08-03 21:47:52 +00:00
|
|
|
ifndef BUILD_DEFINES
|
|
|
|
BUILD_DEFINES =
|
|
|
|
endif
|
|
|
|
|
2011-07-26 08:40:08 +00:00
|
|
|
# ioquake3 svn version that this is based on
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
IOQ3_REVISION = 2398
|
2011-07-26 08:40:08 +00:00
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
#############################################################################
|
|
|
|
#
|
|
|
|
# If you require a different configuration from the defaults below, create a
|
|
|
|
# new file named "Makefile.local" in the same directory as this file and define
|
|
|
|
# your parameters there. This allows you to change configuration without
|
|
|
|
# causing problems with keeping up to date with the repository.
|
|
|
|
#
|
|
|
|
#############################################################################
|
|
|
|
-include Makefile.local
|
|
|
|
|
|
|
|
ifndef PLATFORM
|
|
|
|
PLATFORM=$(COMPILE_PLATFORM)
|
|
|
|
endif
|
|
|
|
export PLATFORM
|
|
|
|
|
|
|
|
ifeq ($(COMPILE_ARCH),powerpc)
|
|
|
|
COMPILE_ARCH=ppc
|
|
|
|
endif
|
|
|
|
ifeq ($(COMPILE_ARCH),powerpc64)
|
|
|
|
COMPILE_ARCH=ppc64
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef ARCH
|
|
|
|
ARCH=$(COMPILE_ARCH)
|
|
|
|
endif
|
|
|
|
export ARCH
|
|
|
|
|
|
|
|
ifneq ($(PLATFORM),$(COMPILE_PLATFORM))
|
|
|
|
CROSS_COMPILING=1
|
|
|
|
else
|
|
|
|
CROSS_COMPILING=0
|
|
|
|
|
|
|
|
ifneq ($(ARCH),$(COMPILE_ARCH))
|
|
|
|
CROSS_COMPILING=1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
export CROSS_COMPILING
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
ifndef VERSION
|
2012-03-30 18:09:39 +00:00
|
|
|
VERSION=v0.0.0.4
|
2011-12-10 00:15:42 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef CLIENTBIN
|
|
|
|
CLIENTBIN=q3rally
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef SERVERBIN
|
|
|
|
SERVERBIN=q3rally-server
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef BASEGAME
|
|
|
|
BASEGAME=baseq3r
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef BASEGAME_CFLAGS
|
|
|
|
BASEGAME_CFLAGS=
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef MISSIONPACK
|
|
|
|
MISSIONPACK=missionpack
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef MISSIONPACK_CFLAGS
|
|
|
|
MISSIONPACK_CFLAGS=-DMISSIONPACK
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifndef COPYDIR
|
|
|
|
COPYDIR="/usr/local/games/quake3"
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef COPYBINDIR
|
|
|
|
COPYBINDIR=$(COPYDIR)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef MOUNT_DIR
|
|
|
|
MOUNT_DIR=code
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef BUILD_DIR
|
|
|
|
BUILD_DIR=build
|
|
|
|
endif
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ifndef TEMPDIR
|
|
|
|
TEMPDIR=/tmp
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifndef GENERATE_DEPENDENCIES
|
|
|
|
GENERATE_DEPENDENCIES=1
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_OPENAL
|
|
|
|
USE_OPENAL=1
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_OPENAL_DLOPEN
|
|
|
|
USE_OPENAL_DLOPEN=1
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_CURL
|
|
|
|
USE_CURL=1
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_CURL_DLOPEN
|
|
|
|
ifeq ($(PLATFORM),mingw32)
|
|
|
|
USE_CURL_DLOPEN=0
|
|
|
|
else
|
|
|
|
USE_CURL_DLOPEN=1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_CODEC_VORBIS
|
|
|
|
USE_CODEC_VORBIS=0
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_MUMBLE
|
|
|
|
USE_MUMBLE=1
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_VOIP
|
|
|
|
USE_VOIP=1
|
|
|
|
endif
|
|
|
|
|
2012-09-15 03:03:44 +00:00
|
|
|
ifndef USE_FREETYPE
|
|
|
|
USE_FREETYPE=0
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifndef USE_INTERNAL_SPEEX
|
|
|
|
USE_INTERNAL_SPEEX=1
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef USE_INTERNAL_ZLIB
|
|
|
|
USE_INTERNAL_ZLIB=1
|
|
|
|
endif
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ifndef USE_INTERNAL_JPEG
|
|
|
|
USE_INTERNAL_JPEG=1
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifndef USE_LOCAL_HEADERS
|
|
|
|
USE_LOCAL_HEADERS=1
|
|
|
|
endif
|
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
ifndef USE_RENDERER_DLOPEN
|
|
|
|
USE_RENDERER_DLOPEN=1
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifndef DEBUG_CFLAGS
|
|
|
|
DEBUG_CFLAGS=-g -O0
|
|
|
|
endif
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ifndef USE_OLD_VM64
|
|
|
|
USE_OLD_VM64=0
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
|
|
|
|
BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH)
|
|
|
|
CDIR=$(MOUNT_DIR)/client
|
|
|
|
SDIR=$(MOUNT_DIR)/server
|
|
|
|
RDIR=$(MOUNT_DIR)/renderer
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
R2DIR=$(MOUNT_DIR)/rend2
|
2011-02-18 14:31:32 +00:00
|
|
|
CMDIR=$(MOUNT_DIR)/qcommon
|
|
|
|
SDLDIR=$(MOUNT_DIR)/sdl
|
|
|
|
ASMDIR=$(MOUNT_DIR)/asm
|
|
|
|
SYSDIR=$(MOUNT_DIR)/sys
|
|
|
|
GDIR=$(MOUNT_DIR)/game
|
|
|
|
CGDIR=$(MOUNT_DIR)/cgame
|
|
|
|
BLIBDIR=$(MOUNT_DIR)/botlib
|
|
|
|
NDIR=$(MOUNT_DIR)/null
|
|
|
|
UIDIR=$(MOUNT_DIR)/ui
|
|
|
|
Q3UIDIR=$(MOUNT_DIR)/q3_ui
|
2011-07-26 08:52:24 +00:00
|
|
|
JPDIR=$(MOUNT_DIR)/jpeg-8c
|
2011-02-18 14:31:32 +00:00
|
|
|
SPEEXDIR=$(MOUNT_DIR)/libspeex
|
|
|
|
ZDIR=$(MOUNT_DIR)/zlib
|
|
|
|
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
|
|
|
|
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
|
|
|
|
Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp
|
|
|
|
Q3LCCETCDIR=$(MOUNT_DIR)/tools/lcc/etc
|
|
|
|
Q3LCCSRCDIR=$(MOUNT_DIR)/tools/lcc/src
|
|
|
|
LOKISETUPDIR=misc/setup
|
|
|
|
NSISDIR=misc/nsis
|
|
|
|
SDLHDIR=$(MOUNT_DIR)/SDL12
|
|
|
|
LIBSDIR=$(MOUNT_DIR)/libs
|
|
|
|
|
|
|
|
bin_path=$(shell which $(1) 2> /dev/null)
|
|
|
|
|
|
|
|
# We won't need this if we only build the server
|
|
|
|
ifneq ($(BUILD_CLIENT),0)
|
|
|
|
# set PKG_CONFIG_PATH to influence this, e.g.
|
|
|
|
# PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
|
|
|
|
ifneq ($(call bin_path, pkg-config),)
|
|
|
|
CURL_CFLAGS=$(shell pkg-config --silence-errors --cflags libcurl)
|
|
|
|
CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl)
|
|
|
|
OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal)
|
|
|
|
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
|
|
|
|
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
|
|
|
|
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
|
2012-09-15 03:03:44 +00:00
|
|
|
FREETYPE_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2)
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
# Use sdl-config if all else fails
|
|
|
|
ifeq ($(SDL_CFLAGS),)
|
|
|
|
ifneq ($(call bin_path, sdl-config),)
|
|
|
|
SDL_CFLAGS=$(shell sdl-config --cflags)
|
|
|
|
SDL_LIBS=$(shell sdl-config --libs)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
# Add svn version info
|
2011-02-18 14:31:32 +00:00
|
|
|
USE_SVN=
|
|
|
|
ifeq ($(wildcard .svn),.svn)
|
|
|
|
SVN_REV=$(shell LANG=C svnversion .)
|
|
|
|
ifneq ($(SVN_REV),)
|
|
|
|
VERSION:=$(VERSION)_SVN$(SVN_REV)
|
|
|
|
USE_SVN=1
|
|
|
|
endif
|
|
|
|
else
|
|
|
|
ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
|
|
|
|
SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
|
|
|
|
ifneq ($(SVN_REV),)
|
|
|
|
VERSION:=$(VERSION)_SVN$(SVN_REV)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
2011-07-26 08:40:08 +00:00
|
|
|
ifdef IOQ3_REVISION
|
|
|
|
VERSION:=$(VERSION)_IOQ3r$(IOQ3_REVISION)
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- LINUX
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
## Defaults
|
|
|
|
LIB=lib
|
|
|
|
|
|
|
|
INSTALL=install
|
|
|
|
MKDIR=mkdir
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(ARCH),axp)
|
|
|
|
ARCH=alpha
|
2011-02-18 14:31:32 +00:00
|
|
|
else
|
|
|
|
ifeq ($(ARCH),x86_64)
|
|
|
|
LIB=lib64
|
|
|
|
else
|
|
|
|
ifeq ($(ARCH),ppc64)
|
|
|
|
LIB=lib64
|
|
|
|
else
|
|
|
|
ifeq ($(ARCH),s390x)
|
|
|
|
LIB=lib64
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
|
|
|
-pipe -DUSE_ICON
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
|
|
|
|
|
|
|
ifeq ($(ARCH),x86_64)
|
|
|
|
OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
|
|
|
|
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
|
|
|
|
-fstrength-reduce
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
|
|
|
HAVE_VM_COMPILED = true
|
|
|
|
else
|
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \
|
|
|
|
-funroll-loops -falign-loops=2 -falign-jumps=2 \
|
|
|
|
-falign-functions=2 -fstrength-reduce
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
|
|
|
HAVE_VM_COMPILED=true
|
|
|
|
else
|
|
|
|
ifeq ($(ARCH),ppc)
|
|
|
|
BASE_CFLAGS += -maltivec
|
|
|
|
HAVE_VM_COMPILED=true
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),ppc64)
|
|
|
|
BASE_CFLAGS += -maltivec
|
|
|
|
HAVE_VM_COMPILED=true
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),sparc)
|
|
|
|
OPTIMIZE += -mtune=ultrasparc3 -mv8plus
|
|
|
|
OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
|
|
|
|
HAVE_VM_COMPILED=true
|
|
|
|
endif
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(ARCH),alpha)
|
|
|
|
# According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555
|
|
|
|
# -ffast-math will cause the client to die with SIGFPE on Alpha
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM)
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
SHLIBEXT=so
|
|
|
|
SHLIBCFLAGS=-fPIC -fvisibility=hidden
|
|
|
|
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
|
|
|
|
|
|
|
THREAD_LIBS=-lpthread
|
|
|
|
LIBS=-ldl -lm
|
|
|
|
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LIBS=$(SDL_LIBS)
|
|
|
|
RENDERER_LIBS = $(SDL_LIBS) -lGL
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifeq ($(USE_OPENAL),1)
|
|
|
|
ifneq ($(USE_OPENAL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += -lopenal
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CURL),1)
|
|
|
|
ifneq ($(USE_CURL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += -lcurl
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CODEC_VORBIS),1)
|
|
|
|
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_MUMBLE),1)
|
|
|
|
CLIENT_LIBS += -lrt
|
|
|
|
endif
|
|
|
|
|
2012-09-15 03:03:44 +00:00
|
|
|
ifeq ($(USE_FREETYPE),1)
|
|
|
|
BASE_CFLAGS += $(FREETYPE_CFLAGS)
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
# linux32 make ...
|
|
|
|
BASE_CFLAGS += -m32
|
|
|
|
else
|
|
|
|
ifeq ($(ARCH),ppc64)
|
|
|
|
BASE_CFLAGS += -m64
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
else # ifeq Linux
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- MAC OS X
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),darwin)
|
|
|
|
HAVE_VM_COMPILED=true
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
LIBS = -framework Cocoa
|
2011-02-18 14:31:32 +00:00
|
|
|
CLIENT_LIBS=
|
2011-08-10 22:10:14 +00:00
|
|
|
RENDERER_LIBS=
|
2011-02-18 14:31:32 +00:00
|
|
|
OPTIMIZEVM=
|
|
|
|
|
|
|
|
BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
|
|
|
|
|
|
|
|
ifeq ($(ARCH),ppc)
|
2011-12-10 00:15:42 +00:00
|
|
|
BASE_CFLAGS += -arch ppc -faltivec -mmacosx-version-min=10.2
|
2011-02-18 14:31:32 +00:00
|
|
|
OPTIMIZEVM += -O3
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),ppc64)
|
2011-12-10 00:15:42 +00:00
|
|
|
BASE_CFLAGS += -arch ppc64 -faltivec -mmacosx-version-min=10.2
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
OPTIMIZEVM += -march=prescott -mfpmath=sse
|
|
|
|
# x86 vm will crash without -mstackrealign since MMX instructions will be
|
|
|
|
# used no matter what and they corrupt the frame pointer in VM calls
|
2011-12-10 00:15:42 +00:00
|
|
|
BASE_CFLAGS += -arch i386 -m32 -mstackrealign
|
2011-08-10 22:10:14 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86_64)
|
2011-12-10 00:15:42 +00:00
|
|
|
OPTIMIZEVM += -arch x86_64 -mfpmath=sse
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
BASE_CFLAGS += -fno-strict-aliasing -DMACOS_X -fno-common -pipe
|
|
|
|
|
|
|
|
ifeq ($(USE_OPENAL),1)
|
|
|
|
ifneq ($(USE_OPENAL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += -framework OpenAL
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CURL),1)
|
|
|
|
ifneq ($(USE_CURL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += -lcurl
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2012-09-15 03:03:44 +00:00
|
|
|
ifeq ($(USE_FREETYPE),1)
|
|
|
|
BASE_CFLAGS += $(FREETYPE_CFLAGS)
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifeq ($(USE_CODEC_VORBIS),1)
|
|
|
|
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
|
|
|
|
endif
|
|
|
|
|
|
|
|
BASE_CFLAGS += -D_THREAD_SAFE=1
|
|
|
|
|
|
|
|
ifeq ($(USE_LOCAL_HEADERS),1)
|
|
|
|
BASE_CFLAGS += -I$(SDLHDIR)/include
|
|
|
|
endif
|
|
|
|
|
|
|
|
# We copy sdlmain before ranlib'ing it so that subversion doesn't think
|
|
|
|
# the file has been modified by each build.
|
|
|
|
LIBSDLMAIN=$(B)/libSDLmain.a
|
|
|
|
LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LIBS += -framework IOKit \
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
$(LIBSDIR)/macosx/libSDL-1.2.0.dylib
|
|
|
|
RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
OPTIMIZEVM += -falign-loops=16
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
|
|
|
|
|
|
|
SHLIBEXT=dylib
|
|
|
|
SHLIBCFLAGS=-fPIC -fno-common
|
2011-12-10 00:15:42 +00:00
|
|
|
SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) -Wl,-U,_com_altivec
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
NOTSHLIBCFLAGS=-mdynamic-no-pic
|
|
|
|
|
|
|
|
TOOLS_CFLAGS += -DMACOS_X
|
|
|
|
|
|
|
|
else # ifeq darwin
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- MINGW32
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),mingw32)
|
|
|
|
|
|
|
|
# Some MinGW installations define CC to cc, but don't actually provide cc,
|
|
|
|
# so explicitly use gcc instead (which is the only option anyway)
|
|
|
|
ifeq ($(call bin_path, $(CC)),)
|
|
|
|
CC=gcc
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef WINDRES
|
|
|
|
WINDRES=windres
|
|
|
|
endif
|
|
|
|
|
|
|
|
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
|
|
|
-DUSE_ICON
|
|
|
|
|
|
|
|
# In the absence of wspiapi.h, require Windows XP or later
|
|
|
|
ifeq ($(shell test -e $(CMDIR)/wspiapi.h; echo $$?),1)
|
|
|
|
BASE_CFLAGS += -DWINVER=0x501
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_OPENAL),1)
|
|
|
|
CLIENT_CFLAGS += $(OPENAL_CFLAGS)
|
2011-08-10 22:10:14 +00:00
|
|
|
ifneq ($(USE_OPENAL_DLOPEN),1)
|
2011-02-18 14:31:32 +00:00
|
|
|
CLIENT_LDFLAGS += $(OPENAL_LDFLAGS)
|
|
|
|
endif
|
|
|
|
endif
|
2011-08-10 21:14:44 +00:00
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifeq ($(ARCH),x64)
|
|
|
|
OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
|
|
|
|
-falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
|
|
|
|
-fstrength-reduce
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) --fast-math
|
|
|
|
HAVE_VM_COMPILED = true
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86)
|
|
|
|
OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \
|
|
|
|
-falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
|
|
|
|
-fstrength-reduce
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
|
|
|
HAVE_VM_COMPILED = true
|
|
|
|
endif
|
|
|
|
|
|
|
|
SHLIBEXT=dll
|
|
|
|
SHLIBCFLAGS=
|
|
|
|
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
|
|
|
|
|
|
|
BINEXT=.exe
|
|
|
|
|
|
|
|
LIBS= -lws2_32 -lwinmm -lpsapi
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LDFLAGS += -mwindows
|
|
|
|
CLIENT_LIBS = -lgdi32 -lole32
|
|
|
|
RENDERER_LIBS = -lgdi32 -lole32 -lopengl32
|
|
|
|
|
2012-09-15 03:03:44 +00:00
|
|
|
ifeq ($(USE_FREETYPE),1)
|
|
|
|
BASE_CFLAGS += -Ifreetype2
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifeq ($(USE_CURL),1)
|
|
|
|
CLIENT_CFLAGS += $(CURL_CFLAGS)
|
|
|
|
ifneq ($(USE_CURL_DLOPEN),1)
|
|
|
|
ifeq ($(USE_LOCAL_HEADERS),1)
|
|
|
|
CLIENT_CFLAGS += -DCURL_STATICLIB
|
|
|
|
ifeq ($(ARCH),x64)
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LIBS += $(LIBSDIR)/win64/libcurl.a
|
|
|
|
else
|
2011-02-18 14:31:32 +00:00
|
|
|
CLIENT_LIBS += $(LIBSDIR)/win32/libcurl.a
|
|
|
|
endif
|
|
|
|
else
|
|
|
|
CLIENT_LIBS += $(CURL_LIBS)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CODEC_VORBIS),1)
|
|
|
|
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(ARCH),x86)
|
|
|
|
# build 32bit
|
|
|
|
BASE_CFLAGS += -m32
|
|
|
|
else
|
|
|
|
BASE_CFLAGS += -m64
|
|
|
|
endif
|
|
|
|
|
|
|
|
# libmingw32 must be linked before libSDLmain
|
|
|
|
CLIENT_LIBS += -lmingw32
|
2011-08-10 22:10:14 +00:00
|
|
|
RENDERER_LIBS += -lmingw32
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifeq ($(USE_LOCAL_HEADERS),1)
|
|
|
|
CLIENT_CFLAGS += -I$(SDLHDIR)/include
|
|
|
|
ifeq ($(ARCH), x86)
|
|
|
|
CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
|
|
|
|
$(LIBSDIR)/win32/libSDL.dll.a
|
2011-08-10 22:10:14 +00:00
|
|
|
RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
|
|
|
|
$(LIBSDIR)/win32/libSDL.dll.a
|
2012-09-15 03:03:44 +00:00
|
|
|
SDLDLL=SDL.dll
|
2011-02-18 14:31:32 +00:00
|
|
|
else
|
|
|
|
CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
|
2011-07-26 08:52:24 +00:00
|
|
|
$(LIBSDIR)/win64/libSDL64.dll.a
|
2011-08-10 22:10:14 +00:00
|
|
|
RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
|
|
|
|
$(LIBSDIR)/win64/libSDL64.dll.a
|
2012-09-15 03:03:44 +00:00
|
|
|
SDLDLL=SDL64.dll
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
else
|
|
|
|
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
|
|
|
CLIENT_LIBS += $(SDL_LIBS)
|
2011-08-10 22:10:14 +00:00
|
|
|
RENDERER_LIBS += $(SDL_LIBS)
|
2012-09-15 03:03:44 +00:00
|
|
|
SDLDLL=SDL.dll
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
BUILD_CLIENT_SMP = 0
|
|
|
|
|
|
|
|
else # ifeq mingw32
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- FREEBSD
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),freebsd)
|
|
|
|
|
|
|
|
# flags
|
|
|
|
BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
|
|
|
|
-Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
|
|
|
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
2011-02-18 14:31:32 +00:00
|
|
|
HAVE_VM_COMPILED = true
|
|
|
|
|
|
|
|
OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
|
|
|
|
|
|
|
SHLIBEXT=so
|
|
|
|
SHLIBCFLAGS=-fPIC
|
|
|
|
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
|
|
|
|
|
|
|
THREAD_LIBS=-lpthread
|
|
|
|
# don't need -ldl (FreeBSD)
|
|
|
|
LIBS=-lm
|
|
|
|
|
|
|
|
CLIENT_LIBS =
|
|
|
|
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LIBS += $(SDL_LIBS)
|
|
|
|
RENDERER_LIBS = $(SDL_LIBS) -lGL
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
# optional features/libraries
|
|
|
|
ifeq ($(USE_OPENAL),1)
|
|
|
|
ifeq ($(USE_OPENAL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += $(THREAD_LIBS) -lopenal
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CURL),1)
|
|
|
|
ifeq ($(USE_CURL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += -lcurl
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CODEC_VORBIS),1)
|
|
|
|
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
|
|
|
|
endif
|
|
|
|
|
|
|
|
# cross-compiling tweaks
|
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
ifeq ($(CROSS_COMPILING),1)
|
|
|
|
BASE_CFLAGS += -m32
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),amd64)
|
|
|
|
ifeq ($(CROSS_COMPILING),1)
|
|
|
|
BASE_CFLAGS += -m64
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
else # ifeq freebsd
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- OPENBSD
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),openbsd)
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ARCH=$(shell uname -m)
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
2011-07-26 08:52:24 +00:00
|
|
|
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifeq ($(USE_CURL),1)
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_CFLAGS += $(CURL_CFLAGS)
|
2011-02-18 14:31:32 +00:00
|
|
|
USE_CURL_DLOPEN=0
|
|
|
|
endif
|
|
|
|
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
# no shm_open on OpenBSD
|
|
|
|
USE_MUMBLE=0
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
SHLIBEXT=so
|
|
|
|
SHLIBCFLAGS=-fPIC
|
|
|
|
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
|
|
|
|
|
|
|
THREAD_LIBS=-pthread
|
|
|
|
LIBS=-lm
|
|
|
|
|
|
|
|
CLIENT_LIBS =
|
|
|
|
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LIBS += $(SDL_LIBS)
|
|
|
|
RENDERER_LIBS = $(SDL_LIBS) -lGL
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifeq ($(USE_OPENAL),1)
|
|
|
|
ifneq ($(USE_OPENAL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += $(THREAD_LIBS) -lossaudio -lopenal
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CODEC_VORBIS),1)
|
|
|
|
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CURL),1)
|
|
|
|
ifneq ($(USE_CURL_DLOPEN),1)
|
|
|
|
CLIENT_LIBS += -lcurl
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
else # ifeq openbsd
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- NETBSD
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),netbsd)
|
|
|
|
|
|
|
|
ifeq ($(shell uname -m),i386)
|
|
|
|
ARCH=i386
|
|
|
|
endif
|
|
|
|
|
|
|
|
LIBS=-lm
|
|
|
|
SHLIBEXT=so
|
|
|
|
SHLIBCFLAGS=-fPIC
|
|
|
|
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
|
|
|
THREAD_LIBS=-lpthread
|
|
|
|
|
|
|
|
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
|
|
|
|
|
2011-08-10 22:10:14 +00:00
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
HAVE_VM_COMPILED=true
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
BUILD_CLIENT = 0
|
|
|
|
|
|
|
|
else # ifeq netbsd
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- IRIX
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),irix64)
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ARCH=mips
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
CC = c99
|
|
|
|
MKDIR = mkdir -p
|
|
|
|
|
|
|
|
BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 \
|
2011-08-10 22:10:14 +00:00
|
|
|
-I. -I$(ROOT)/usr/include
|
|
|
|
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
2011-02-18 14:31:32 +00:00
|
|
|
OPTIMIZE = -O3
|
|
|
|
|
|
|
|
SHLIBEXT=so
|
|
|
|
SHLIBCFLAGS=
|
|
|
|
SHLIBLDFLAGS=-shared
|
|
|
|
|
|
|
|
LIBS=-ldl -lm -lgen
|
|
|
|
# FIXME: The X libraries probably aren't necessary?
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LIBS=-L/usr/X11/$(LIB) $(SDL_LIBS) \
|
2011-02-18 14:31:32 +00:00
|
|
|
-lX11 -lXext -lm
|
2011-08-10 22:10:14 +00:00
|
|
|
RENDERER_LIBS = $(SDL_LIBS) -lGL
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
else # ifeq IRIX
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- SunOS
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),sunos)
|
|
|
|
|
|
|
|
CC=gcc
|
|
|
|
INSTALL=ginstall
|
|
|
|
MKDIR=gmkdir
|
|
|
|
COPYDIR="/usr/local/share/games/quake3"
|
|
|
|
|
|
|
|
ifneq (,$(findstring i86pc,$(shell uname -m)))
|
|
|
|
ARCH=i386
|
|
|
|
else #default to sparc
|
|
|
|
ARCH=sparc
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(ARCH),i386)
|
|
|
|
ifneq ($(ARCH),sparc)
|
|
|
|
$(error arch $(ARCH) is currently not supported)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
|
|
|
-pipe -DUSE_ICON
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
OPTIMIZEVM = -O3 -funroll-loops
|
|
|
|
|
|
|
|
ifeq ($(ARCH),sparc)
|
|
|
|
OPTIMIZEVM += -O3 \
|
|
|
|
-fstrength-reduce -falign-functions=2 \
|
|
|
|
-mtune=ultrasparc3 -mv8plus -mno-faster-structs
|
|
|
|
HAVE_VM_COMPILED=true
|
|
|
|
else
|
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
OPTIMIZEVM += -march=i586 -fomit-frame-pointer \
|
|
|
|
-falign-loops=2 -falign-jumps=2 \
|
|
|
|
-falign-functions=2 -fstrength-reduce
|
|
|
|
HAVE_VM_COMPILED=true
|
|
|
|
BASE_CFLAGS += -m32
|
|
|
|
CLIENT_CFLAGS += -I/usr/X11/include/NVIDIA
|
|
|
|
CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
|
|
|
|
|
|
|
SHLIBEXT=so
|
|
|
|
SHLIBCFLAGS=-fPIC
|
|
|
|
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
|
|
|
|
|
|
|
THREAD_LIBS=-lpthread
|
|
|
|
LIBS=-lsocket -lnsl -ldl -lm
|
|
|
|
|
|
|
|
BOTCFLAGS=-O0
|
|
|
|
|
2011-08-10 22:10:14 +00:00
|
|
|
CLIENT_LIBS +=$(SDL_LIBS) -lX11 -lXext -liconv -lm
|
|
|
|
RENDERER_LIBS = $(SDL_LIBS) -lGL
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
else # ifeq sunos
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# SETUP AND BUILD -- GENERIC
|
|
|
|
#############################################################################
|
2011-08-10 22:10:14 +00:00
|
|
|
BASE_CFLAGS=
|
2011-02-18 14:31:32 +00:00
|
|
|
OPTIMIZE = -O3
|
|
|
|
|
|
|
|
SHLIBEXT=so
|
|
|
|
SHLIBCFLAGS=-fPIC
|
|
|
|
SHLIBLDFLAGS=-shared
|
|
|
|
|
|
|
|
endif #Linux
|
|
|
|
endif #darwin
|
|
|
|
endif #mingw32
|
|
|
|
endif #FreeBSD
|
|
|
|
endif #OpenBSD
|
|
|
|
endif #NetBSD
|
|
|
|
endif #IRIX
|
|
|
|
endif #SunOS
|
|
|
|
|
2011-08-10 22:10:14 +00:00
|
|
|
ifneq ($(HAVE_VM_COMPILED),true)
|
|
|
|
BASE_CFLAGS += -DNO_VM_COMPILED
|
|
|
|
BUILD_GAME_QVM=0
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
TARGETS =
|
|
|
|
|
2012-09-15 03:03:44 +00:00
|
|
|
ifeq ($(USE_FREETYPE),1)
|
|
|
|
BASE_CFLAGS += -DBUILD_FREETYPE
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifndef FULLBINEXT
|
2011-03-08 07:53:52 +00:00
|
|
|
# Leave .x86 off win32 binaries
|
|
|
|
ifeq ($(ARCH),x86)
|
|
|
|
FULLBINEXT=$(BINEXT)
|
|
|
|
else
|
2011-02-18 14:31:32 +00:00
|
|
|
FULLBINEXT=.$(ARCH)$(BINEXT)
|
|
|
|
endif
|
2011-03-08 07:53:52 +00:00
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifndef SHLIBNAME
|
|
|
|
SHLIBNAME=$(ARCH).$(SHLIBEXT)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(BUILD_SERVER),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
TARGETS += $(B)/$(SERVERBIN)$(FULLBINEXT)
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(BUILD_CLIENT),0)
|
2011-08-10 21:14:44 +00:00
|
|
|
ifneq ($(USE_RENDERER_DLOPEN),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT) $(B)/renderer_opengl1_$(SHLIBNAME)
|
2011-08-10 21:14:44 +00:00
|
|
|
ifneq ($(BUILD_CLIENT_SMP),0)
|
|
|
|
TARGETS += $(B)/renderer_opengl1_smp_$(SHLIBNAME)
|
|
|
|
endif
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
ifneq ($(BUILD_RENDERER_REND2), 0)
|
|
|
|
TARGETS += $(B)/renderer_rend2_$(SHLIBNAME)
|
|
|
|
ifneq ($(BUILD_CLIENT_SMP),0)
|
|
|
|
TARGETS += $(B)/renderer_rend2_smp_$(SHLIBNAME)
|
|
|
|
endif
|
|
|
|
endif
|
2011-08-10 21:14:44 +00:00
|
|
|
else
|
2011-12-10 00:15:42 +00:00
|
|
|
TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
ifneq ($(BUILD_RENDERER_REND2), 0)
|
|
|
|
TARGETS += $(B)/$(CLIENTBIN)_rend2$(FULLBINEXT)
|
|
|
|
endif
|
2011-08-10 21:14:44 +00:00
|
|
|
ifneq ($(BUILD_CLIENT_SMP),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
TARGETS += $(B)/$(CLIENTBIN)-smp$(FULLBINEXT)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
ifneq ($(BUILD_RENDERER_REND2), 0)
|
|
|
|
TARGETS += $(B)/$(CLIENTBIN)_rend2-smp$(FULLBINEXT)
|
|
|
|
endif
|
2011-08-10 21:14:44 +00:00
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(BUILD_GAME_SO),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
ifneq ($(BUILD_BASEGAME),0)
|
2011-02-18 14:31:32 +00:00
|
|
|
TARGETS += \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/cgame$(SHLIBNAME) \
|
|
|
|
$(B)/$(BASEGAME)/qagame$(SHLIBNAME) \
|
|
|
|
$(B)/$(BASEGAME)/ui$(SHLIBNAME)
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
2011-12-10 00:15:42 +00:00
|
|
|
ifneq ($(BUILD_MISSIONPACK),0)
|
|
|
|
TARGETS += \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame$(SHLIBNAME) \
|
|
|
|
$(B)/$(MISSIONPACK)/qagame$(SHLIBNAME) \
|
|
|
|
$(B)/$(MISSIONPACK)/ui$(SHLIBNAME)
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(BUILD_GAME_QVM),0)
|
|
|
|
ifneq ($(CROSS_COMPILING),1)
|
2011-12-10 00:15:42 +00:00
|
|
|
ifneq ($(BUILD_BASEGAME),0)
|
|
|
|
TARGETS += \
|
|
|
|
$(B)/$(BASEGAME)/vm/cgame.qvm \
|
|
|
|
$(B)/$(BASEGAME)/vm/qagame.qvm \
|
|
|
|
$(B)/$(BASEGAME)/vm/ui.qvm
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
ifneq ($(BUILD_MISSIONPACK),0)
|
|
|
|
TARGETS += \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/vm/qagame.qvm \
|
|
|
|
$(B)/$(MISSIONPACK)/vm/cgame.qvm \
|
|
|
|
$(B)/$(MISSIONPACK)/vm/ui.qvm
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2011-08-10 22:10:14 +00:00
|
|
|
ifeq ($(USE_OPENAL),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_OPENAL
|
|
|
|
ifeq ($(USE_OPENAL_DLOPEN),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_OPENAL_DLOPEN
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CURL),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_CURL
|
|
|
|
ifeq ($(USE_CURL_DLOPEN),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_CURL_DLOPEN
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_CODEC_VORBIS),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_RENDERER_DLOPEN),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_RENDERER_DLOPEN
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifeq ($(USE_MUMBLE),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_MUMBLE
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_VOIP),1)
|
|
|
|
CLIENT_CFLAGS += -DUSE_VOIP
|
|
|
|
SERVER_CFLAGS += -DUSE_VOIP
|
|
|
|
ifeq ($(USE_INTERNAL_SPEEX),1)
|
|
|
|
CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
|
|
|
|
else
|
|
|
|
CLIENT_LIBS += -lspeex -lspeexdsp
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_INTERNAL_ZLIB),1)
|
|
|
|
BASE_CFLAGS += -DNO_GZIP
|
|
|
|
BASE_CFLAGS += -I$(ZDIR)
|
|
|
|
else
|
|
|
|
LIBS += -lz
|
|
|
|
endif
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(USE_INTERNAL_JPEG),1)
|
|
|
|
BASE_CFLAGS += -DUSE_INTERNAL_JPEG
|
|
|
|
BASE_CFLAGS += -I$(JPDIR)
|
|
|
|
else
|
2011-08-10 22:10:14 +00:00
|
|
|
RENDERER_LIBS += -ljpeg
|
2011-07-26 08:52:24 +00:00
|
|
|
endif
|
|
|
|
|
2012-09-15 03:03:44 +00:00
|
|
|
ifeq ($(USE_FREETYPE),1)
|
|
|
|
RENDERER_LIBS += -lfreetype
|
|
|
|
endif
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
ifeq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
|
|
|
|
BASE_CFLAGS += -Qunused-arguments
|
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifdef DEFAULT_BASEDIR
|
|
|
|
BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_LOCAL_HEADERS),1)
|
|
|
|
BASE_CFLAGS += -DUSE_LOCAL_HEADERS
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(BUILD_STANDALONE),1)
|
2011-08-03 21:47:52 +00:00
|
|
|
BUILD_DEFINES += -DSTANDALONE
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(GENERATE_DEPENDENCIES),1)
|
|
|
|
DEPEND_CFLAGS = -MMD
|
|
|
|
else
|
|
|
|
DEPEND_CFLAGS =
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(NO_STRIP),1)
|
|
|
|
STRIP_FLAG =
|
|
|
|
else
|
|
|
|
STRIP_FLAG = -s
|
|
|
|
endif
|
|
|
|
|
|
|
|
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
|
2011-07-26 08:52:24 +00:00
|
|
|
BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral
|
|
|
|
BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
|
|
|
|
BASE_CFLAGS += -Wdisabled-optimization
|
|
|
|
BASE_CFLAGS += -Werror-implicit-function-declaration
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-08-03 21:47:52 +00:00
|
|
|
BASE_CFLAGS += $(BUILD_DEFINES)
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifeq ($(V),1)
|
|
|
|
echo_cmd=@:
|
|
|
|
Q=
|
|
|
|
else
|
|
|
|
echo_cmd=@echo
|
|
|
|
Q=@
|
|
|
|
endif
|
|
|
|
|
|
|
|
define DO_CC
|
|
|
|
$(echo_cmd) "CC $<"
|
|
|
|
$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
|
|
|
|
endef
|
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
define DO_REF_CC
|
|
|
|
$(echo_cmd) "REF_CC $<"
|
|
|
|
$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
|
|
|
|
endef
|
|
|
|
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
define DO_REF_STR
|
|
|
|
$(echo_cmd) "REF_STR $<"
|
|
|
|
$(Q)rm -f $@
|
|
|
|
$(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@
|
|
|
|
$(Q)cat $< | sed 's/^/\"/;s/$$/\\n\"/' >> $@
|
|
|
|
$(Q)echo ";" >> $@
|
|
|
|
endef
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
define DO_SMP_CC
|
|
|
|
$(echo_cmd) "SMP_CC $<"
|
2011-08-10 21:14:44 +00:00
|
|
|
$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -DSMP -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_BOT_CC
|
|
|
|
$(echo_cmd) "BOT_CC $<"
|
|
|
|
$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
|
|
|
|
endef
|
|
|
|
|
|
|
|
ifeq ($(GENERATE_DEPENDENCIES),1)
|
|
|
|
DO_QVM_DEP=cat $(@:%.o=%.d) | sed -e 's/\.o/\.asm/g' >> $(@:%.o=%.d)
|
|
|
|
endif
|
|
|
|
|
|
|
|
define DO_SHLIB_CC
|
|
|
|
$(echo_cmd) "SHLIB_CC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(BASEGAME_CFLAGS) $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_GAME_CC
|
|
|
|
$(echo_cmd) "GAME_CC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(BASEGAME_CFLAGS) -DQAGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_CGAME_CC
|
|
|
|
$(echo_cmd) "CGAME_CC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(BASEGAME_CFLAGS) -DCGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_UI_CC
|
|
|
|
$(echo_cmd) "UI_CC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(BASEGAME_CFLAGS) -DUI $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_SHLIB_CC_MISSIONPACK
|
|
|
|
$(echo_cmd) "SHLIB_CC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(MISSIONPACK_CFLAGS) $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_GAME_CC_MISSIONPACK
|
|
|
|
$(echo_cmd) "GAME_CC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(MISSIONPACK_CFLAGS) -DQAGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_CGAME_CC_MISSIONPACK
|
|
|
|
$(echo_cmd) "CGAME_CC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(MISSIONPACK_CFLAGS) -DCGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_UI_CC_MISSIONPACK
|
|
|
|
$(echo_cmd) "UI_CC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(CC) $(MISSIONPACK_CFLAGS) -DUI $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
|
2011-02-18 14:31:32 +00:00
|
|
|
$(Q)$(DO_QVM_DEP)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_AS
|
|
|
|
$(echo_cmd) "AS $<"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(OPTIMIZE) -x assembler-with-cpp -o $@ -c $<
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_DED_CC
|
|
|
|
$(echo_cmd) "DED_CC $<"
|
|
|
|
$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_WINDRES
|
|
|
|
$(echo_cmd) "WINDRES $<"
|
|
|
|
$(Q)$(WINDRES) -i $< -o $@
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# MAIN TARGETS
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
default: release
|
|
|
|
all: debug release
|
|
|
|
|
|
|
|
debug:
|
|
|
|
@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(BASE_CFLAGS) $(DEPEND_CFLAGS)" \
|
|
|
|
OPTIMIZE="$(DEBUG_CFLAGS)" OPTIMIZEVM="$(DEBUG_CFLAGS)" \
|
|
|
|
CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
|
|
|
|
|
|
|
|
release:
|
|
|
|
@$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(BASE_CFLAGS) $(DEPEND_CFLAGS)" \
|
|
|
|
OPTIMIZE="-DNDEBUG $(OPTIMIZE)" OPTIMIZEVM="-DNDEBUG $(OPTIMIZEVM)" \
|
|
|
|
CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
|
|
|
|
|
|
|
|
# Create the build directories, check libraries and print out
|
|
|
|
# an informational message, then start building
|
|
|
|
targets: makedirs
|
|
|
|
@echo ""
|
2011-12-10 00:15:42 +00:00
|
|
|
@echo "Building $(CLIENTBIN) in $(B):"
|
2011-07-26 08:40:08 +00:00
|
|
|
ifdef IOQ3_REVISION
|
|
|
|
@echo " IOQ3_REVISION: $(IOQ3_REVISION)"
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
@echo " PLATFORM: $(PLATFORM)"
|
|
|
|
@echo " ARCH: $(ARCH)"
|
|
|
|
@echo " VERSION: $(VERSION)"
|
|
|
|
@echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)"
|
|
|
|
@echo " COMPILE_ARCH: $(COMPILE_ARCH)"
|
|
|
|
@echo " CC: $(CC)"
|
|
|
|
@echo ""
|
|
|
|
@echo " CFLAGS:"
|
|
|
|
-@for i in $(CFLAGS); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
-@for i in $(OPTIMIZE); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
@echo ""
|
|
|
|
@echo " CLIENT_CFLAGS:"
|
|
|
|
-@for i in $(CLIENT_CFLAGS); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
@echo ""
|
|
|
|
@echo " SERVER_CFLAGS:"
|
|
|
|
-@for i in $(SERVER_CFLAGS); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
@echo ""
|
|
|
|
@echo " LDFLAGS:"
|
|
|
|
-@for i in $(LDFLAGS); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
@echo ""
|
|
|
|
@echo " LIBS:"
|
|
|
|
-@for i in $(LIBS); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
@echo ""
|
|
|
|
@echo " CLIENT_LIBS:"
|
|
|
|
-@for i in $(CLIENT_LIBS); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
@echo ""
|
|
|
|
@echo " Output:"
|
|
|
|
-@for i in $(TARGETS); \
|
|
|
|
do \
|
|
|
|
echo " $$i"; \
|
|
|
|
done
|
|
|
|
@echo ""
|
|
|
|
ifneq ($(TARGETS),)
|
|
|
|
@$(MAKE) $(TARGETS) V=$(V)
|
|
|
|
endif
|
|
|
|
|
|
|
|
makedirs:
|
|
|
|
@if [ ! -d $(BUILD_DIR) ];then $(MKDIR) $(BUILD_DIR);fi
|
|
|
|
@if [ ! -d $(B) ];then $(MKDIR) $(B);fi
|
|
|
|
@if [ ! -d $(B)/client ];then $(MKDIR) $(B)/client;fi
|
2011-08-10 21:14:44 +00:00
|
|
|
@if [ ! -d $(B)/renderer ];then $(MKDIR) $(B)/renderer;fi
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
@if [ ! -d $(B)/rend2 ];then $(MKDIR) $(B)/rend2;fi
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
@if [ ! -d $(B)/rend2/glsl ];then $(MKDIR) $(B)/rend2/glsl;fi
|
2011-08-10 21:14:44 +00:00
|
|
|
@if [ ! -d $(B)/renderersmp ];then $(MKDIR) $(B)/renderersmp;fi
|
2011-02-18 14:31:32 +00:00
|
|
|
@if [ ! -d $(B)/ded ];then $(MKDIR) $(B)/ded;fi
|
2011-12-10 00:15:42 +00:00
|
|
|
@if [ ! -d $(B)/$(BASEGAME) ];then $(MKDIR) $(B)/$(BASEGAME);fi
|
|
|
|
@if [ ! -d $(B)/$(BASEGAME)/cgame ];then $(MKDIR) $(B)/$(BASEGAME)/cgame;fi
|
|
|
|
@if [ ! -d $(B)/$(BASEGAME)/game ];then $(MKDIR) $(B)/$(BASEGAME)/game;fi
|
|
|
|
@if [ ! -d $(B)/$(BASEGAME)/ui ];then $(MKDIR) $(B)/$(BASEGAME)/ui;fi
|
|
|
|
@if [ ! -d $(B)/$(BASEGAME)/qcommon ];then $(MKDIR) $(B)/$(BASEGAME)/qcommon;fi
|
|
|
|
@if [ ! -d $(B)/$(BASEGAME)/vm ];then $(MKDIR) $(B)/$(BASEGAME)/vm;fi
|
|
|
|
@if [ ! -d $(B)/$(MISSIONPACK) ];then $(MKDIR) $(B)/$(MISSIONPACK);fi
|
|
|
|
@if [ ! -d $(B)/$(MISSIONPACK)/cgame ];then $(MKDIR) $(B)/$(MISSIONPACK)/cgame;fi
|
|
|
|
@if [ ! -d $(B)/$(MISSIONPACK)/game ];then $(MKDIR) $(B)/$(MISSIONPACK)/game;fi
|
|
|
|
@if [ ! -d $(B)/$(MISSIONPACK)/ui ];then $(MKDIR) $(B)/$(MISSIONPACK)/ui;fi
|
|
|
|
@if [ ! -d $(B)/$(MISSIONPACK)/qcommon ];then $(MKDIR) $(B)/$(MISSIONPACK)/qcommon;fi
|
|
|
|
@if [ ! -d $(B)/$(MISSIONPACK)/vm ];then $(MKDIR) $(B)/$(MISSIONPACK)/vm;fi
|
2011-02-18 14:31:32 +00:00
|
|
|
@if [ ! -d $(B)/tools ];then $(MKDIR) $(B)/tools;fi
|
|
|
|
@if [ ! -d $(B)/tools/asm ];then $(MKDIR) $(B)/tools/asm;fi
|
|
|
|
@if [ ! -d $(B)/tools/etc ];then $(MKDIR) $(B)/tools/etc;fi
|
|
|
|
@if [ ! -d $(B)/tools/rcc ];then $(MKDIR) $(B)/tools/rcc;fi
|
|
|
|
@if [ ! -d $(B)/tools/cpp ];then $(MKDIR) $(B)/tools/cpp;fi
|
|
|
|
@if [ ! -d $(B)/tools/lburg ];then $(MKDIR) $(B)/tools/lburg;fi
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# QVM BUILD TOOLS
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
TOOLS_OPTIMIZE = -g -Wall -fno-strict-aliasing
|
|
|
|
TOOLS_CFLAGS += $(TOOLS_OPTIMIZE) \
|
|
|
|
-DTEMPDIR=\"$(TEMPDIR)\" -DSYSTEM=\"\" \
|
|
|
|
-I$(Q3LCCSRCDIR) \
|
|
|
|
-I$(LBURGDIR)
|
|
|
|
TOOLS_LIBS =
|
|
|
|
TOOLS_LDFLAGS =
|
|
|
|
|
|
|
|
ifeq ($(GENERATE_DEPENDENCIES),1)
|
|
|
|
TOOLS_CFLAGS += -MMD
|
|
|
|
endif
|
|
|
|
|
|
|
|
define DO_TOOLS_CC
|
|
|
|
$(echo_cmd) "TOOLS_CC $<"
|
|
|
|
$(Q)$(CC) $(TOOLS_CFLAGS) -o $@ -c $<
|
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_TOOLS_CC_DAGCHECK
|
|
|
|
$(echo_cmd) "TOOLS_CC_DAGCHECK $<"
|
|
|
|
$(Q)$(CC) $(TOOLS_CFLAGS) -Wno-unused -o $@ -c $<
|
|
|
|
endef
|
|
|
|
|
|
|
|
LBURG = $(B)/tools/lburg/lburg$(BINEXT)
|
|
|
|
DAGCHECK_C = $(B)/tools/rcc/dagcheck.c
|
|
|
|
Q3RCC = $(B)/tools/q3rcc$(BINEXT)
|
|
|
|
Q3CPP = $(B)/tools/q3cpp$(BINEXT)
|
|
|
|
Q3LCC = $(B)/tools/q3lcc$(BINEXT)
|
|
|
|
Q3ASM = $(B)/tools/q3asm$(BINEXT)
|
|
|
|
|
|
|
|
LBURGOBJ= \
|
|
|
|
$(B)/tools/lburg/lburg.o \
|
|
|
|
$(B)/tools/lburg/gram.o
|
|
|
|
|
|
|
|
$(B)/tools/lburg/%.o: $(LBURGDIR)/%.c
|
|
|
|
$(DO_TOOLS_CC)
|
|
|
|
|
|
|
|
$(LBURG): $(LBURGOBJ)
|
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $^ $(TOOLS_LIBS)
|
|
|
|
|
|
|
|
Q3RCCOBJ = \
|
|
|
|
$(B)/tools/rcc/alloc.o \
|
|
|
|
$(B)/tools/rcc/bind.o \
|
|
|
|
$(B)/tools/rcc/bytecode.o \
|
|
|
|
$(B)/tools/rcc/dag.o \
|
|
|
|
$(B)/tools/rcc/dagcheck.o \
|
|
|
|
$(B)/tools/rcc/decl.o \
|
|
|
|
$(B)/tools/rcc/enode.o \
|
|
|
|
$(B)/tools/rcc/error.o \
|
|
|
|
$(B)/tools/rcc/event.o \
|
|
|
|
$(B)/tools/rcc/expr.o \
|
|
|
|
$(B)/tools/rcc/gen.o \
|
|
|
|
$(B)/tools/rcc/init.o \
|
|
|
|
$(B)/tools/rcc/inits.o \
|
|
|
|
$(B)/tools/rcc/input.o \
|
|
|
|
$(B)/tools/rcc/lex.o \
|
|
|
|
$(B)/tools/rcc/list.o \
|
|
|
|
$(B)/tools/rcc/main.o \
|
|
|
|
$(B)/tools/rcc/null.o \
|
|
|
|
$(B)/tools/rcc/output.o \
|
|
|
|
$(B)/tools/rcc/prof.o \
|
|
|
|
$(B)/tools/rcc/profio.o \
|
|
|
|
$(B)/tools/rcc/simp.o \
|
|
|
|
$(B)/tools/rcc/stmt.o \
|
|
|
|
$(B)/tools/rcc/string.o \
|
|
|
|
$(B)/tools/rcc/sym.o \
|
|
|
|
$(B)/tools/rcc/symbolic.o \
|
|
|
|
$(B)/tools/rcc/trace.o \
|
|
|
|
$(B)/tools/rcc/tree.o \
|
|
|
|
$(B)/tools/rcc/types.o
|
|
|
|
|
|
|
|
$(DAGCHECK_C): $(LBURG) $(Q3LCCSRCDIR)/dagcheck.md
|
|
|
|
$(echo_cmd) "LBURG $(Q3LCCSRCDIR)/dagcheck.md"
|
|
|
|
$(Q)$(LBURG) $(Q3LCCSRCDIR)/dagcheck.md $@
|
|
|
|
|
|
|
|
$(B)/tools/rcc/dagcheck.o: $(DAGCHECK_C)
|
|
|
|
$(DO_TOOLS_CC_DAGCHECK)
|
|
|
|
|
|
|
|
$(B)/tools/rcc/%.o: $(Q3LCCSRCDIR)/%.c
|
|
|
|
$(DO_TOOLS_CC)
|
|
|
|
|
|
|
|
$(Q3RCC): $(Q3RCCOBJ)
|
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $^ $(TOOLS_LIBS)
|
|
|
|
|
|
|
|
Q3CPPOBJ = \
|
|
|
|
$(B)/tools/cpp/cpp.o \
|
|
|
|
$(B)/tools/cpp/lex.o \
|
|
|
|
$(B)/tools/cpp/nlist.o \
|
|
|
|
$(B)/tools/cpp/tokens.o \
|
|
|
|
$(B)/tools/cpp/macro.o \
|
|
|
|
$(B)/tools/cpp/eval.o \
|
|
|
|
$(B)/tools/cpp/include.o \
|
|
|
|
$(B)/tools/cpp/hideset.o \
|
|
|
|
$(B)/tools/cpp/getopt.o \
|
|
|
|
$(B)/tools/cpp/unix.o
|
|
|
|
|
|
|
|
$(B)/tools/cpp/%.o: $(Q3CPPDIR)/%.c
|
|
|
|
$(DO_TOOLS_CC)
|
|
|
|
|
|
|
|
$(Q3CPP): $(Q3CPPOBJ)
|
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $^ $(TOOLS_LIBS)
|
|
|
|
|
|
|
|
Q3LCCOBJ = \
|
|
|
|
$(B)/tools/etc/lcc.o \
|
|
|
|
$(B)/tools/etc/bytecode.o
|
|
|
|
|
|
|
|
$(B)/tools/etc/%.o: $(Q3LCCETCDIR)/%.c
|
|
|
|
$(DO_TOOLS_CC)
|
|
|
|
|
|
|
|
$(Q3LCC): $(Q3LCCOBJ) $(Q3RCC) $(Q3CPP)
|
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS)
|
|
|
|
|
|
|
|
define DO_Q3LCC
|
|
|
|
$(echo_cmd) "Q3LCC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_CGAME_Q3LCC
|
|
|
|
$(echo_cmd) "CGAME_Q3LCC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DCGAME $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_GAME_Q3LCC
|
|
|
|
$(echo_cmd) "GAME_Q3LCC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DQAGAME $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_UI_Q3LCC
|
|
|
|
$(echo_cmd) "UI_Q3LCC $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DUI $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_Q3LCC_MISSIONPACK
|
|
|
|
$(echo_cmd) "Q3LCC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_CGAME_Q3LCC_MISSIONPACK
|
|
|
|
$(echo_cmd) "CGAME_Q3LCC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DCGAME $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_GAME_Q3LCC_MISSIONPACK
|
|
|
|
$(echo_cmd) "GAME_Q3LCC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DQAGAME $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
define DO_UI_Q3LCC_MISSIONPACK
|
|
|
|
$(echo_cmd) "UI_Q3LCC_MISSIONPACK $<"
|
2011-12-10 00:15:42 +00:00
|
|
|
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DUI $(BUILD_DEFINES) -o $@ $<
|
2011-02-18 14:31:32 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
|
|
Q3ASMOBJ = \
|
|
|
|
$(B)/tools/asm/q3asm.o \
|
|
|
|
$(B)/tools/asm/cmdlib.o
|
|
|
|
|
|
|
|
$(B)/tools/asm/%.o: $(Q3ASMDIR)/%.c
|
|
|
|
$(DO_TOOLS_CC)
|
|
|
|
|
|
|
|
$(Q3ASM): $(Q3ASMOBJ)
|
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $^ $(TOOLS_LIBS)
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# CLIENT/SERVER
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
Q3OBJ = \
|
|
|
|
$(B)/client/cl_cgame.o \
|
|
|
|
$(B)/client/cl_cin.o \
|
|
|
|
$(B)/client/cl_console.o \
|
|
|
|
$(B)/client/cl_input.o \
|
|
|
|
$(B)/client/cl_keys.o \
|
|
|
|
$(B)/client/cl_main.o \
|
|
|
|
$(B)/client/cl_net_chan.o \
|
|
|
|
$(B)/client/cl_parse.o \
|
|
|
|
$(B)/client/cl_scrn.o \
|
|
|
|
$(B)/client/cl_ui.o \
|
|
|
|
$(B)/client/cl_avi.o \
|
|
|
|
\
|
|
|
|
$(B)/client/cm_load.o \
|
|
|
|
$(B)/client/cm_patch.o \
|
|
|
|
$(B)/client/cm_polylib.o \
|
|
|
|
$(B)/client/cm_test.o \
|
|
|
|
$(B)/client/cm_trace.o \
|
|
|
|
\
|
|
|
|
$(B)/client/cmd.o \
|
|
|
|
$(B)/client/common.o \
|
|
|
|
$(B)/client/cvar.o \
|
|
|
|
$(B)/client/files.o \
|
|
|
|
$(B)/client/md4.o \
|
|
|
|
$(B)/client/md5.o \
|
|
|
|
$(B)/client/msg.o \
|
|
|
|
$(B)/client/net_chan.o \
|
|
|
|
$(B)/client/net_ip.o \
|
|
|
|
$(B)/client/huffman.o \
|
|
|
|
\
|
|
|
|
$(B)/client/snd_adpcm.o \
|
|
|
|
$(B)/client/snd_dma.o \
|
|
|
|
$(B)/client/snd_mem.o \
|
|
|
|
$(B)/client/snd_mix.o \
|
|
|
|
$(B)/client/snd_wavelet.o \
|
|
|
|
\
|
|
|
|
$(B)/client/snd_main.o \
|
|
|
|
$(B)/client/snd_codec.o \
|
|
|
|
$(B)/client/snd_codec_wav.o \
|
|
|
|
$(B)/client/snd_codec_ogg.o \
|
|
|
|
\
|
|
|
|
$(B)/client/qal.o \
|
|
|
|
$(B)/client/snd_openal.o \
|
|
|
|
\
|
|
|
|
$(B)/client/cl_curl.o \
|
|
|
|
\
|
|
|
|
$(B)/client/sv_bot.o \
|
|
|
|
$(B)/client/sv_ccmds.o \
|
|
|
|
$(B)/client/sv_client.o \
|
|
|
|
$(B)/client/sv_game.o \
|
|
|
|
$(B)/client/sv_init.o \
|
|
|
|
$(B)/client/sv_main.o \
|
|
|
|
$(B)/client/sv_net_chan.o \
|
|
|
|
$(B)/client/sv_snapshot.o \
|
|
|
|
$(B)/client/sv_world.o \
|
|
|
|
\
|
|
|
|
$(B)/client/q_math.o \
|
|
|
|
$(B)/client/q_shared.o \
|
|
|
|
\
|
|
|
|
$(B)/client/unzip.o \
|
|
|
|
$(B)/client/ioapi.o \
|
|
|
|
$(B)/client/puff.o \
|
|
|
|
$(B)/client/vm.o \
|
|
|
|
$(B)/client/vm_interpreted.o \
|
|
|
|
\
|
|
|
|
$(B)/client/be_aas_bspq3.o \
|
|
|
|
$(B)/client/be_aas_cluster.o \
|
|
|
|
$(B)/client/be_aas_debug.o \
|
|
|
|
$(B)/client/be_aas_entity.o \
|
|
|
|
$(B)/client/be_aas_file.o \
|
|
|
|
$(B)/client/be_aas_main.o \
|
|
|
|
$(B)/client/be_aas_move.o \
|
|
|
|
$(B)/client/be_aas_optimize.o \
|
|
|
|
$(B)/client/be_aas_reach.o \
|
|
|
|
$(B)/client/be_aas_route.o \
|
|
|
|
$(B)/client/be_aas_routealt.o \
|
|
|
|
$(B)/client/be_aas_sample.o \
|
|
|
|
$(B)/client/be_ai_char.o \
|
|
|
|
$(B)/client/be_ai_chat.o \
|
|
|
|
$(B)/client/be_ai_gen.o \
|
|
|
|
$(B)/client/be_ai_goal.o \
|
|
|
|
$(B)/client/be_ai_move.o \
|
|
|
|
$(B)/client/be_ai_weap.o \
|
|
|
|
$(B)/client/be_ai_weight.o \
|
|
|
|
$(B)/client/be_ea.o \
|
|
|
|
$(B)/client/be_interface.o \
|
|
|
|
$(B)/client/l_crc.o \
|
|
|
|
$(B)/client/l_libvar.o \
|
|
|
|
$(B)/client/l_log.o \
|
|
|
|
$(B)/client/l_memory.o \
|
|
|
|
$(B)/client/l_precomp.o \
|
|
|
|
$(B)/client/l_script.o \
|
|
|
|
$(B)/client/l_struct.o \
|
|
|
|
\
|
|
|
|
$(B)/client/sdl_input.o \
|
|
|
|
$(B)/client/sdl_snd.o \
|
|
|
|
\
|
|
|
|
$(B)/client/con_log.o \
|
|
|
|
$(B)/client/sys_main.o
|
|
|
|
|
2012-09-15 03:03:44 +00:00
|
|
|
ifeq ($(PLATFORM),mingw32)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/con_passive.o
|
|
|
|
else
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/con_tty.o
|
|
|
|
endif
|
|
|
|
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
Q3R2OBJ = \
|
|
|
|
$(B)/rend2/tr_animation.o \
|
|
|
|
$(B)/rend2/tr_backend.o \
|
|
|
|
$(B)/rend2/tr_bsp.o \
|
|
|
|
$(B)/rend2/tr_cmds.o \
|
|
|
|
$(B)/rend2/tr_curve.o \
|
|
|
|
$(B)/rend2/tr_extramath.o \
|
|
|
|
$(B)/rend2/tr_extensions.o \
|
|
|
|
$(B)/rend2/tr_fbo.o \
|
|
|
|
$(B)/rend2/tr_flares.o \
|
|
|
|
$(B)/rend2/tr_font.o \
|
|
|
|
$(B)/rend2/tr_glsl.o \
|
|
|
|
$(B)/rend2/tr_image.o \
|
|
|
|
$(B)/rend2/tr_image_png.o \
|
|
|
|
$(B)/rend2/tr_image_jpg.o \
|
|
|
|
$(B)/rend2/tr_image_bmp.o \
|
|
|
|
$(B)/rend2/tr_image_tga.o \
|
|
|
|
$(B)/rend2/tr_image_pcx.o \
|
|
|
|
$(B)/rend2/tr_init.o \
|
|
|
|
$(B)/rend2/tr_light.o \
|
|
|
|
$(B)/rend2/tr_main.o \
|
|
|
|
$(B)/rend2/tr_marks.o \
|
|
|
|
$(B)/rend2/tr_mesh.o \
|
|
|
|
$(B)/rend2/tr_model.o \
|
|
|
|
$(B)/rend2/tr_model_iqm.o \
|
|
|
|
$(B)/rend2/tr_noise.o \
|
|
|
|
$(B)/rend2/tr_postprocess.o \
|
|
|
|
$(B)/rend2/tr_scene.o \
|
|
|
|
$(B)/rend2/tr_shade.o \
|
|
|
|
$(B)/rend2/tr_shade_calc.o \
|
|
|
|
$(B)/rend2/tr_shader.o \
|
|
|
|
$(B)/rend2/tr_shadows.o \
|
|
|
|
$(B)/rend2/tr_sky.o \
|
|
|
|
$(B)/rend2/tr_surface.o \
|
|
|
|
$(B)/rend2/tr_vbo.o \
|
|
|
|
$(B)/rend2/tr_world.o \
|
|
|
|
\
|
|
|
|
$(B)/renderer/sdl_gamma.o
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
|
|
|
|
Q3R2STRINGOBJ = \
|
|
|
|
$(B)/rend2/glsl/bokeh_fp.o \
|
|
|
|
$(B)/rend2/glsl/bokeh_vp.o \
|
|
|
|
$(B)/rend2/glsl/calclevels4x_fp.o \
|
|
|
|
$(B)/rend2/glsl/calclevels4x_vp.o \
|
|
|
|
$(B)/rend2/glsl/depthblur_fp.o \
|
|
|
|
$(B)/rend2/glsl/depthblur_vp.o \
|
|
|
|
$(B)/rend2/glsl/dlight_fp.o \
|
|
|
|
$(B)/rend2/glsl/dlight_vp.o \
|
|
|
|
$(B)/rend2/glsl/down4x_fp.o \
|
|
|
|
$(B)/rend2/glsl/down4x_vp.o \
|
|
|
|
$(B)/rend2/glsl/fogpass_fp.o \
|
|
|
|
$(B)/rend2/glsl/fogpass_vp.o \
|
|
|
|
$(B)/rend2/glsl/generic_fp.o \
|
|
|
|
$(B)/rend2/glsl/generic_vp.o \
|
|
|
|
$(B)/rend2/glsl/lightall_fp.o \
|
|
|
|
$(B)/rend2/glsl/lightall_vp.o \
|
|
|
|
$(B)/rend2/glsl/pshadow_fp.o \
|
|
|
|
$(B)/rend2/glsl/pshadow_vp.o \
|
|
|
|
$(B)/rend2/glsl/shadowfill_fp.o \
|
|
|
|
$(B)/rend2/glsl/shadowfill_vp.o \
|
|
|
|
$(B)/rend2/glsl/shadowmask_fp.o \
|
|
|
|
$(B)/rend2/glsl/shadowmask_vp.o \
|
|
|
|
$(B)/rend2/glsl/ssao_fp.o \
|
|
|
|
$(B)/rend2/glsl/ssao_vp.o \
|
|
|
|
$(B)/rend2/glsl/texturecolor_fp.o \
|
|
|
|
$(B)/rend2/glsl/texturecolor_vp.o \
|
|
|
|
$(B)/rend2/glsl/tonemap_fp.o \
|
|
|
|
$(B)/rend2/glsl/tonemap_vp.o
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
Q3ROBJ = \
|
|
|
|
$(B)/renderer/tr_animation.o \
|
|
|
|
$(B)/renderer/tr_backend.o \
|
|
|
|
$(B)/renderer/tr_bsp.o \
|
|
|
|
$(B)/renderer/tr_cmds.o \
|
|
|
|
$(B)/renderer/tr_curve.o \
|
|
|
|
$(B)/renderer/tr_flares.o \
|
|
|
|
$(B)/renderer/tr_font.o \
|
|
|
|
$(B)/renderer/tr_image.o \
|
|
|
|
$(B)/renderer/tr_image_png.o \
|
|
|
|
$(B)/renderer/tr_image_jpg.o \
|
|
|
|
$(B)/renderer/tr_image_bmp.o \
|
|
|
|
$(B)/renderer/tr_image_tga.o \
|
|
|
|
$(B)/renderer/tr_image_pcx.o \
|
|
|
|
$(B)/renderer/tr_init.o \
|
|
|
|
$(B)/renderer/tr_light.o \
|
|
|
|
$(B)/renderer/tr_main.o \
|
|
|
|
$(B)/renderer/tr_marks.o \
|
|
|
|
$(B)/renderer/tr_mesh.o \
|
|
|
|
$(B)/renderer/tr_model.o \
|
|
|
|
$(B)/renderer/tr_model_iqm.o \
|
|
|
|
$(B)/renderer/tr_noise.o \
|
|
|
|
$(B)/renderer/tr_scene.o \
|
|
|
|
$(B)/renderer/tr_shade.o \
|
|
|
|
$(B)/renderer/tr_shade_calc.o \
|
|
|
|
$(B)/renderer/tr_shader.o \
|
|
|
|
$(B)/renderer/tr_shadows.o \
|
|
|
|
$(B)/renderer/tr_sky.o \
|
|
|
|
$(B)/renderer/tr_surface.o \
|
|
|
|
$(B)/renderer/tr_world.o \
|
|
|
|
\
|
|
|
|
$(B)/renderer/sdl_gamma.o
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
|
|
|
|
Q3RPOBJ_UP = \
|
|
|
|
$(B)/renderer/sdl_glimp.o
|
|
|
|
|
|
|
|
Q3RPOBJ_SMP = \
|
|
|
|
$(B)/renderersmp/sdl_glimp.o
|
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
ifneq ($(USE_RENDERER_DLOPEN), 0)
|
|
|
|
Q3ROBJ += \
|
|
|
|
$(B)/renderer/q_shared.o \
|
|
|
|
$(B)/renderer/puff.o \
|
|
|
|
$(B)/renderer/q_math.o \
|
|
|
|
$(B)/renderer/tr_subs.o
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
|
|
|
|
Q3R2OBJ += \
|
|
|
|
$(B)/renderer/q_shared.o \
|
|
|
|
$(B)/renderer/puff.o \
|
|
|
|
$(B)/renderer/q_math.o \
|
|
|
|
$(B)/renderer/tr_subs.o
|
2011-08-10 21:14:44 +00:00
|
|
|
endif
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
ifneq ($(USE_INTERNAL_JPEG),0)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
JPGOBJ = \
|
2011-08-10 21:14:44 +00:00
|
|
|
$(B)/renderer/jaricom.o \
|
|
|
|
$(B)/renderer/jcapimin.o \
|
|
|
|
$(B)/renderer/jcapistd.o \
|
|
|
|
$(B)/renderer/jcarith.o \
|
|
|
|
$(B)/renderer/jccoefct.o \
|
|
|
|
$(B)/renderer/jccolor.o \
|
|
|
|
$(B)/renderer/jcdctmgr.o \
|
|
|
|
$(B)/renderer/jchuff.o \
|
|
|
|
$(B)/renderer/jcinit.o \
|
|
|
|
$(B)/renderer/jcmainct.o \
|
|
|
|
$(B)/renderer/jcmarker.o \
|
|
|
|
$(B)/renderer/jcmaster.o \
|
|
|
|
$(B)/renderer/jcomapi.o \
|
|
|
|
$(B)/renderer/jcparam.o \
|
|
|
|
$(B)/renderer/jcprepct.o \
|
|
|
|
$(B)/renderer/jcsample.o \
|
|
|
|
$(B)/renderer/jctrans.o \
|
|
|
|
$(B)/renderer/jdapimin.o \
|
|
|
|
$(B)/renderer/jdapistd.o \
|
|
|
|
$(B)/renderer/jdarith.o \
|
|
|
|
$(B)/renderer/jdatadst.o \
|
|
|
|
$(B)/renderer/jdatasrc.o \
|
|
|
|
$(B)/renderer/jdcoefct.o \
|
|
|
|
$(B)/renderer/jdcolor.o \
|
|
|
|
$(B)/renderer/jddctmgr.o \
|
|
|
|
$(B)/renderer/jdhuff.o \
|
|
|
|
$(B)/renderer/jdinput.o \
|
|
|
|
$(B)/renderer/jdmainct.o \
|
|
|
|
$(B)/renderer/jdmarker.o \
|
|
|
|
$(B)/renderer/jdmaster.o \
|
|
|
|
$(B)/renderer/jdmerge.o \
|
|
|
|
$(B)/renderer/jdpostct.o \
|
|
|
|
$(B)/renderer/jdsample.o \
|
|
|
|
$(B)/renderer/jdtrans.o \
|
|
|
|
$(B)/renderer/jerror.o \
|
|
|
|
$(B)/renderer/jfdctflt.o \
|
|
|
|
$(B)/renderer/jfdctfst.o \
|
|
|
|
$(B)/renderer/jfdctint.o \
|
|
|
|
$(B)/renderer/jidctflt.o \
|
|
|
|
$(B)/renderer/jidctfst.o \
|
|
|
|
$(B)/renderer/jidctint.o \
|
|
|
|
$(B)/renderer/jmemmgr.o \
|
|
|
|
$(B)/renderer/jmemnobs.o \
|
|
|
|
$(B)/renderer/jquant1.o \
|
|
|
|
$(B)/renderer/jquant2.o \
|
|
|
|
$(B)/renderer/jutils.o
|
2011-07-26 08:52:24 +00:00
|
|
|
endif
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/snd_mixa.o \
|
|
|
|
$(B)/client/matha.o \
|
2011-07-26 08:52:24 +00:00
|
|
|
$(B)/client/snapvector.o \
|
|
|
|
$(B)/client/ftola.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/snd_mixa.o \
|
|
|
|
$(B)/client/matha.o \
|
2011-07-26 08:52:24 +00:00
|
|
|
$(B)/client/snapvector.o \
|
|
|
|
$(B)/client/ftola.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86_64)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/snapvector.o \
|
|
|
|
$(B)/client/ftola.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),amd64)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/snapvector.o \
|
|
|
|
$(B)/client/ftola.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x64)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/snapvector.o \
|
|
|
|
$(B)/client/ftola.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_VOIP),1)
|
|
|
|
ifeq ($(USE_INTERNAL_SPEEX),1)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/bits.o \
|
|
|
|
$(B)/client/buffer.o \
|
|
|
|
$(B)/client/cb_search.o \
|
|
|
|
$(B)/client/exc_10_16_table.o \
|
|
|
|
$(B)/client/exc_10_32_table.o \
|
|
|
|
$(B)/client/exc_20_32_table.o \
|
|
|
|
$(B)/client/exc_5_256_table.o \
|
|
|
|
$(B)/client/exc_5_64_table.o \
|
|
|
|
$(B)/client/exc_8_128_table.o \
|
|
|
|
$(B)/client/fftwrap.o \
|
|
|
|
$(B)/client/filterbank.o \
|
|
|
|
$(B)/client/filters.o \
|
|
|
|
$(B)/client/gain_table.o \
|
|
|
|
$(B)/client/gain_table_lbr.o \
|
|
|
|
$(B)/client/hexc_10_32_table.o \
|
|
|
|
$(B)/client/hexc_table.o \
|
|
|
|
$(B)/client/high_lsp_tables.o \
|
|
|
|
$(B)/client/jitter.o \
|
|
|
|
$(B)/client/kiss_fft.o \
|
|
|
|
$(B)/client/kiss_fftr.o \
|
|
|
|
$(B)/client/lpc.o \
|
|
|
|
$(B)/client/lsp.o \
|
|
|
|
$(B)/client/lsp_tables_nb.o \
|
|
|
|
$(B)/client/ltp.o \
|
|
|
|
$(B)/client/mdf.o \
|
|
|
|
$(B)/client/modes.o \
|
|
|
|
$(B)/client/modes_wb.o \
|
|
|
|
$(B)/client/nb_celp.o \
|
|
|
|
$(B)/client/preprocess.o \
|
|
|
|
$(B)/client/quant_lsp.o \
|
|
|
|
$(B)/client/resample.o \
|
|
|
|
$(B)/client/sb_celp.o \
|
|
|
|
$(B)/client/smallft.o \
|
|
|
|
$(B)/client/speex.o \
|
|
|
|
$(B)/client/speex_callbacks.o \
|
|
|
|
$(B)/client/speex_header.o \
|
|
|
|
$(B)/client/stereo.o \
|
|
|
|
$(B)/client/vbr.o \
|
|
|
|
$(B)/client/vq.o \
|
|
|
|
$(B)/client/window.o
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_INTERNAL_ZLIB),1)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/adler32.o \
|
|
|
|
$(B)/client/crc32.o \
|
|
|
|
$(B)/client/inffast.o \
|
|
|
|
$(B)/client/inflate.o \
|
|
|
|
$(B)/client/inftrees.o \
|
|
|
|
$(B)/client/zutil.o
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(HAVE_VM_COMPILED),true)
|
|
|
|
ifeq ($(ARCH),i386)
|
2011-07-26 08:52:24 +00:00
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86)
|
2011-07-26 08:52:24 +00:00
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86_64)
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(USE_OLD_VM64),1)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86_64.o \
|
|
|
|
$(B)/client/vm_x86_64_assembler.o
|
|
|
|
else
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86.o
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),amd64)
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(USE_OLD_VM64),1)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86_64.o \
|
|
|
|
$(B)/client/vm_x86_64_assembler.o
|
|
|
|
else
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86.o
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x64)
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(USE_OLD_VM64),1)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86_64.o \
|
|
|
|
$(B)/client/vm_x86_64_assembler.o
|
|
|
|
else
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/vm_x86.o
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),ppc)
|
|
|
|
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),ppc64)
|
|
|
|
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),sparc)
|
|
|
|
Q3OBJ += $(B)/client/vm_sparc.o
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),mingw32)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/win_resource.o \
|
|
|
|
$(B)/client/sys_win32.o
|
|
|
|
else
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/sys_unix.o
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),darwin)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/sys_osx.o
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_MUMBLE),1)
|
|
|
|
Q3OBJ += \
|
|
|
|
$(B)/client/libmumblelink.o
|
|
|
|
endif
|
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
ifneq ($(USE_RENDERER_DLOPEN),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
|
2011-08-10 21:14:44 +00:00
|
|
|
-o $@ $(Q3OBJ) \
|
2011-02-18 14:31:32 +00:00
|
|
|
$(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS)
|
|
|
|
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(B)/renderer_opengl1_$(SHLIBNAME): $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ)
|
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \
|
|
|
|
$(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS)
|
|
|
|
|
|
|
|
$(B)/renderer_opengl1_smp_$(SHLIBNAME): $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ)
|
2011-08-10 21:14:44 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \
|
2011-08-10 21:14:44 +00:00
|
|
|
$(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS)
|
|
|
|
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
$(B)/renderer_rend2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ)
|
2011-08-10 21:14:44 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \
|
2011-08-10 21:14:44 +00:00
|
|
|
$(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
$(B)/renderer_rend2_smp_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS)
|
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
else
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ) $(LIBSDLMAIN)
|
2011-08-10 21:14:44 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
-o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \
|
2011-08-10 21:14:44 +00:00
|
|
|
$(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
|
|
|
|
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(B)/$(CLIENTBIN)-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) $(LIBSDLMAIN)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
-o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \
|
|
|
|
$(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
|
|
|
|
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
$(B)/$(CLIENTBIN)_rend2$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ) $(LIBSDLMAIN)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
-o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
|
|
|
|
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
$(B)/$(CLIENTBIN)_rend2-smp$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) $(LIBSDLMAIN)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
-o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \
|
2011-08-10 21:14:44 +00:00
|
|
|
$(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifneq ($(strip $(LIBSDLMAIN)),)
|
|
|
|
ifneq ($(strip $(LIBSDLMAINSRC)),)
|
|
|
|
$(LIBSDLMAIN) : $(LIBSDLMAINSRC)
|
|
|
|
cp $< $@
|
|
|
|
ranlib $@
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# DEDICATED SERVER
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
Q3DOBJ = \
|
|
|
|
$(B)/ded/sv_bot.o \
|
|
|
|
$(B)/ded/sv_client.o \
|
|
|
|
$(B)/ded/sv_ccmds.o \
|
|
|
|
$(B)/ded/sv_game.o \
|
|
|
|
$(B)/ded/sv_init.o \
|
|
|
|
$(B)/ded/sv_main.o \
|
|
|
|
$(B)/ded/sv_net_chan.o \
|
|
|
|
$(B)/ded/sv_snapshot.o \
|
|
|
|
$(B)/ded/sv_world.o \
|
|
|
|
\
|
|
|
|
$(B)/ded/cm_load.o \
|
|
|
|
$(B)/ded/cm_patch.o \
|
|
|
|
$(B)/ded/cm_polylib.o \
|
|
|
|
$(B)/ded/cm_test.o \
|
|
|
|
$(B)/ded/cm_trace.o \
|
|
|
|
$(B)/ded/cmd.o \
|
|
|
|
$(B)/ded/common.o \
|
|
|
|
$(B)/ded/cvar.o \
|
|
|
|
$(B)/ded/files.o \
|
|
|
|
$(B)/ded/md4.o \
|
|
|
|
$(B)/ded/msg.o \
|
|
|
|
$(B)/ded/net_chan.o \
|
|
|
|
$(B)/ded/net_ip.o \
|
|
|
|
$(B)/ded/huffman.o \
|
|
|
|
\
|
|
|
|
$(B)/ded/q_math.o \
|
|
|
|
$(B)/ded/q_shared.o \
|
|
|
|
\
|
|
|
|
$(B)/ded/unzip.o \
|
|
|
|
$(B)/ded/ioapi.o \
|
|
|
|
$(B)/ded/vm.o \
|
|
|
|
$(B)/ded/vm_interpreted.o \
|
|
|
|
\
|
|
|
|
$(B)/ded/be_aas_bspq3.o \
|
|
|
|
$(B)/ded/be_aas_cluster.o \
|
|
|
|
$(B)/ded/be_aas_debug.o \
|
|
|
|
$(B)/ded/be_aas_entity.o \
|
|
|
|
$(B)/ded/be_aas_file.o \
|
|
|
|
$(B)/ded/be_aas_main.o \
|
|
|
|
$(B)/ded/be_aas_move.o \
|
|
|
|
$(B)/ded/be_aas_optimize.o \
|
|
|
|
$(B)/ded/be_aas_reach.o \
|
|
|
|
$(B)/ded/be_aas_route.o \
|
|
|
|
$(B)/ded/be_aas_routealt.o \
|
|
|
|
$(B)/ded/be_aas_sample.o \
|
|
|
|
$(B)/ded/be_ai_char.o \
|
|
|
|
$(B)/ded/be_ai_chat.o \
|
|
|
|
$(B)/ded/be_ai_gen.o \
|
|
|
|
$(B)/ded/be_ai_goal.o \
|
|
|
|
$(B)/ded/be_ai_move.o \
|
|
|
|
$(B)/ded/be_ai_weap.o \
|
|
|
|
$(B)/ded/be_ai_weight.o \
|
|
|
|
$(B)/ded/be_ea.o \
|
|
|
|
$(B)/ded/be_interface.o \
|
|
|
|
$(B)/ded/l_crc.o \
|
|
|
|
$(B)/ded/l_libvar.o \
|
|
|
|
$(B)/ded/l_log.o \
|
|
|
|
$(B)/ded/l_memory.o \
|
|
|
|
$(B)/ded/l_precomp.o \
|
|
|
|
$(B)/ded/l_script.o \
|
|
|
|
$(B)/ded/l_struct.o \
|
|
|
|
\
|
|
|
|
$(B)/ded/null_client.o \
|
|
|
|
$(B)/ded/null_input.o \
|
|
|
|
$(B)/ded/null_snddma.o \
|
|
|
|
\
|
|
|
|
$(B)/ded/con_log.o \
|
|
|
|
$(B)/ded/sys_main.o
|
|
|
|
|
|
|
|
ifeq ($(ARCH),i386)
|
|
|
|
Q3DOBJ += \
|
2011-07-26 08:52:24 +00:00
|
|
|
$(B)/ded/matha.o \
|
|
|
|
$(B)/ded/snapvector.o \
|
|
|
|
$(B)/ded/ftola.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86)
|
|
|
|
Q3DOBJ += \
|
2011-07-26 08:52:24 +00:00
|
|
|
$(B)/ded/matha.o \
|
|
|
|
$(B)/ded/snapvector.o \
|
|
|
|
$(B)/ded/ftola.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86_64)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/snapvector.o \
|
|
|
|
$(B)/ded/ftola.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),amd64)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/snapvector.o \
|
|
|
|
$(B)/ded/ftola.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x64)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/snapvector.o \
|
|
|
|
$(B)/ded/ftola.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(USE_INTERNAL_ZLIB),1)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/adler32.o \
|
|
|
|
$(B)/ded/crc32.o \
|
|
|
|
$(B)/ded/inffast.o \
|
|
|
|
$(B)/ded/inflate.o \
|
|
|
|
$(B)/ded/inftrees.o \
|
|
|
|
$(B)/ded/zutil.o
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(HAVE_VM_COMPILED),true)
|
|
|
|
ifeq ($(ARCH),i386)
|
2011-07-26 08:52:24 +00:00
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86)
|
2011-07-26 08:52:24 +00:00
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86.o
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x86_64)
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(USE_OLD_VM64),1)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86_64.o \
|
|
|
|
$(B)/ded/vm_x86_64_assembler.o
|
|
|
|
else
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86.o
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),amd64)
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(USE_OLD_VM64),1)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86_64.o \
|
|
|
|
$(B)/ded/vm_x86_64_assembler.o
|
|
|
|
else
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86.o
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),x64)
|
2011-07-26 08:52:24 +00:00
|
|
|
ifeq ($(USE_OLD_VM64),1)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86_64.o \
|
|
|
|
$(B)/ded/vm_x86_64_assembler.o
|
|
|
|
else
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/vm_x86.o
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),ppc)
|
|
|
|
Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),ppc64)
|
|
|
|
Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
|
|
|
|
endif
|
|
|
|
ifeq ($(ARCH),sparc)
|
|
|
|
Q3DOBJ += $(B)/ded/vm_sparc.o
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),mingw32)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/win_resource.o \
|
|
|
|
$(B)/ded/sys_win32.o \
|
|
|
|
$(B)/ded/con_win32.o
|
|
|
|
else
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/sys_unix.o \
|
|
|
|
$(B)/ded/con_tty.o
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(PLATFORM),darwin)
|
|
|
|
Q3DOBJ += \
|
|
|
|
$(B)/ded/sys_osx.o
|
|
|
|
endif
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(SERVERBIN)$(FULLBINEXT): $(Q3DOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## Q3RALLY CGAME
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
Q3CGOBJ_ = \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/cgame/cg_main.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/bg_misc.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/bg_pmove.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/bg_physics.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/bg_slidemove.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/bg_lib.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/bg_wheel_forces.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_atmospheric.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_consolecmds.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_draw.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_drawtools.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_effects.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_ents.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_event.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_info.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_localents.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_marks.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_particles.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_players.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_playerstate.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_predict.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_draw.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_drawtools.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_hud.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_hud2.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_platetools.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_racetools.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_rearweapons.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_scripted_objects.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_rally_tools.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_scoreboard.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_servercmds.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_snapshot.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_view.o \
|
|
|
|
$(B)/$(BASEGAME)/cgame/cg_weapons.o \
|
2011-02-18 14:31:32 +00:00
|
|
|
\
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/qcommon/q_math.o \
|
|
|
|
$(B)/$(BASEGAME)/qcommon/q_shared.o
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
Q3CGOBJ = $(Q3CGOBJ_) $(B)/$(BASEGAME)/cgame/cg_syscalls.o
|
2011-02-18 14:31:32 +00:00
|
|
|
Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/cgame$(SHLIBNAME): $(Q3CGOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm $(Q3ASM)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "Q3ASM $@"
|
|
|
|
$(Q)$(Q3ASM) -o $@ $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## MISSIONPACK CGAME
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
MPCGOBJ_ = \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_main.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/bg_misc.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/bg_pmove.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/bg_slidemove.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/bg_lib.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_consolecmds.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_newdraw.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_draw.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_drawtools.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_effects.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_ents.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_event.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_info.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_localents.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_marks.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_particles.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_players.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_playerstate.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_predict.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_scoreboard.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_servercmds.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_snapshot.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_view.o \
|
|
|
|
$(B)/$(MISSIONPACK)/cgame/cg_weapons.o \
|
|
|
|
$(B)/$(MISSIONPACK)/ui/ui_shared.o \
|
2011-02-18 14:31:32 +00:00
|
|
|
\
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/qcommon/q_math.o \
|
|
|
|
$(B)/$(MISSIONPACK)/qcommon/q_shared.o
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
MPCGOBJ = $(MPCGOBJ_) $(B)/$(MISSIONPACK)/cgame/cg_syscalls.o
|
2011-02-18 14:31:32 +00:00
|
|
|
MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/cgame$(SHLIBNAME): $(MPCGOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm $(Q3ASM)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "Q3ASM $@"
|
|
|
|
$(Q)$(Q3ASM) -o $@ $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## Q3RALLY GAME
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
Q3GOBJ_ = \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/game/g_main.o \
|
|
|
|
$(B)/$(BASEGAME)/game/ai_chat.o \
|
|
|
|
$(B)/$(BASEGAME)/game/ai_cmd.o \
|
|
|
|
$(B)/$(BASEGAME)/game/ai_dmnet.o \
|
|
|
|
$(B)/$(BASEGAME)/game/ai_dmq3.o \
|
|
|
|
$(B)/$(BASEGAME)/game/ai_main.o \
|
|
|
|
$(B)/$(BASEGAME)/game/ai_team.o \
|
|
|
|
$(B)/$(BASEGAME)/game/ai_vcmd.o \
|
|
|
|
$(B)/$(BASEGAME)/game/bg_misc.o \
|
|
|
|
$(B)/$(BASEGAME)/game/bg_pmove.o \
|
|
|
|
$(B)/$(BASEGAME)/game/bg_physics.o \
|
|
|
|
$(B)/$(BASEGAME)/game/bg_slidemove.o \
|
|
|
|
$(B)/$(BASEGAME)/game/bg_lib.o \
|
|
|
|
$(B)/$(BASEGAME)/game/bg_wheel_forces.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_active.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_arenas.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_bot.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_client.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_cmds.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_combat.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_items.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_mem.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_misc.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_missile.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_mover.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_hazard.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_mapents.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_mapobjects.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_observer_cams.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_racetools.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_rearweapon.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_scripted_objects.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_rally_tools.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_session.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_spawn.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_svcmds.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_target.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_team.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_trigger.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_utils.o \
|
|
|
|
$(B)/$(BASEGAME)/game/g_weapon.o \
|
2011-02-18 14:31:32 +00:00
|
|
|
\
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/qcommon/q_math.o \
|
|
|
|
$(B)/$(BASEGAME)/qcommon/q_shared.o
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
Q3GOBJ = $(Q3GOBJ_) $(B)/$(BASEGAME)/game/g_syscalls.o
|
2011-02-18 14:31:32 +00:00
|
|
|
Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/qagame$(SHLIBNAME): $(Q3GOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm $(Q3ASM)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "Q3ASM $@"
|
|
|
|
$(Q)$(Q3ASM) -o $@ $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## MISSIONPACK GAME
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
MPGOBJ_ = \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/game/g_main.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/ai_chat.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/ai_cmd.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/ai_dmnet.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/ai_dmq3.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/ai_main.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/ai_team.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/ai_vcmd.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/bg_misc.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/bg_pmove.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/bg_slidemove.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/bg_lib.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_active.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_arenas.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_bot.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_client.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_cmds.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_combat.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_items.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_mem.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_misc.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_missile.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_mover.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_session.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_spawn.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_svcmds.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_target.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_team.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_trigger.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_utils.o \
|
|
|
|
$(B)/$(MISSIONPACK)/game/g_weapon.o \
|
2011-02-18 14:31:32 +00:00
|
|
|
\
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/qcommon/q_math.o \
|
|
|
|
$(B)/$(MISSIONPACK)/qcommon/q_shared.o
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
MPGOBJ = $(MPGOBJ_) $(B)/$(MISSIONPACK)/game/g_syscalls.o
|
2011-02-18 14:31:32 +00:00
|
|
|
MPGVMOBJ = $(MPGOBJ_:%.o=%.asm)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/qagame$(SHLIBNAME): $(MPGOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm $(Q3ASM)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "Q3ASM $@"
|
|
|
|
$(Q)$(Q3ASM) -o $@ $(MPGVMOBJ) $(GDIR)/g_syscalls.asm
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## Q3RALLY UI
|
|
|
|
#############################################################################
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
# $(B)/$(BASEGAME)/ui/ui_controls2.o
|
|
|
|
# $(B)/$(BASEGAME)/ui/ui_servers2.o
|
|
|
|
# $(B)/$(BASEGAME)/ui/ui_startserver.o
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
Q3UIOBJ_ = \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/ui/ui_main.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/bg_misc.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/bg_lib.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_addbots.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_atoms.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_cdkey.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_cinematics.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_confirm.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_connect.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_credits.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_demo2.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_display.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_gameinfo.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_ingame.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_loadconfig.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_menu.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_mfield.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_mods.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_network.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_options.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_playermodel.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_players.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_playersettings.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_preferences.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_qmenu.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_controls.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_credits.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_favorites.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_gfxloading.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_options.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_servers.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_startserver.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_rally_tools.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_removebots.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_saveconfig.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_serverinfo.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_setup.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_sound.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_sparena.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_specifyserver.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_splevel.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_sppostgame.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_spskill.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_team.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_teamorders.o \
|
|
|
|
$(B)/$(BASEGAME)/ui/ui_video.o \
|
2011-02-18 14:31:32 +00:00
|
|
|
\
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/qcommon/q_math.o \
|
|
|
|
$(B)/$(BASEGAME)/qcommon/q_shared.o
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
Q3UIOBJ = $(Q3UIOBJ_) $(B)/$(MISSIONPACK)/ui/ui_syscalls.o
|
2011-02-18 14:31:32 +00:00
|
|
|
Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/ui$(SHLIBNAME): $(Q3UIOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "Q3ASM $@"
|
|
|
|
$(Q)$(Q3ASM) -o $@ $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## MISSIONPACK UI
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
MPUIOBJ_ = \
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/ui/ui_main.o \
|
|
|
|
$(B)/$(MISSIONPACK)/ui/ui_atoms.o \
|
|
|
|
$(B)/$(MISSIONPACK)/ui/ui_gameinfo.o \
|
|
|
|
$(B)/$(MISSIONPACK)/ui/ui_players.o \
|
|
|
|
$(B)/$(MISSIONPACK)/ui/ui_shared.o \
|
2011-02-18 14:31:32 +00:00
|
|
|
\
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/ui/bg_misc.o \
|
|
|
|
$(B)/$(MISSIONPACK)/ui/bg_lib.o \
|
2011-02-18 14:31:32 +00:00
|
|
|
\
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/qcommon/q_math.o \
|
|
|
|
$(B)/$(MISSIONPACK)/qcommon/q_shared.o
|
2011-02-18 14:31:32 +00:00
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
MPUIOBJ = $(MPUIOBJ_) $(B)/$(MISSIONPACK)/ui/ui_syscalls.o
|
2011-02-18 14:31:32 +00:00
|
|
|
MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/ui$(SHLIBNAME): $(MPUIOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "LD $@"
|
|
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/vm/ui.qvm: $(MPUIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(echo_cmd) "Q3ASM $@"
|
|
|
|
$(Q)$(Q3ASM) -o $@ $(MPUIVMOBJ) $(UIDIR)/ui_syscalls.asm
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## CLIENT/SERVER RULES
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(ASMDIR)/%.s
|
|
|
|
$(DO_AS)
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
# k8 so inline assembler knows about SSE
|
|
|
|
$(B)/client/%.o: $(ASMDIR)/%.c
|
|
|
|
$(DO_CC) -march=k8
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
$(B)/client/%.o: $(CDIR)/%.c
|
|
|
|
$(DO_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(SDIR)/%.c
|
|
|
|
$(DO_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(CMDIR)/%.c
|
|
|
|
$(DO_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(BLIBDIR)/%.c
|
|
|
|
$(DO_BOT_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(SPEEXDIR)/%.c
|
|
|
|
$(DO_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(ZDIR)/%.c
|
|
|
|
$(DO_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(SDLDIR)/%.c
|
|
|
|
$(DO_CC)
|
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
$(B)/renderersmp/%.o: $(SDLDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_SMP_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(SYSDIR)/%.c
|
|
|
|
$(DO_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(SYSDIR)/%.m
|
|
|
|
$(DO_CC)
|
|
|
|
|
|
|
|
$(B)/client/%.o: $(SYSDIR)/%.rc
|
|
|
|
$(DO_WINDRES)
|
|
|
|
|
|
|
|
|
2011-08-10 21:14:44 +00:00
|
|
|
$(B)/renderer/%.o: $(CMDIR)/%.c
|
|
|
|
$(DO_REF_CC)
|
|
|
|
|
|
|
|
$(B)/renderer/%.o: $(SDLDIR)/%.c
|
|
|
|
$(DO_REF_CC)
|
|
|
|
|
|
|
|
$(B)/renderer/%.o: $(JPDIR)/%.c
|
|
|
|
$(DO_REF_CC)
|
|
|
|
|
|
|
|
$(B)/renderer/%.o: $(RDIR)/%.c
|
|
|
|
$(DO_REF_CC)
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
|
|
|
|
$(B)/rend2/glsl/%.c: $(R2DIR)/glsl/%.glsl
|
|
|
|
$(DO_REF_STR)
|
|
|
|
|
|
|
|
$(B)/rend2/glsl/%.o: $(B)/rend2/glsl/%.c
|
|
|
|
$(DO_REF_CC)
|
|
|
|
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
$(B)/rend2/%.o: $(R2DIR)/%.c
|
|
|
|
$(DO_REF_CC)
|
2011-08-10 21:14:44 +00:00
|
|
|
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
$(B)/ded/%.o: $(ASMDIR)/%.s
|
|
|
|
$(DO_AS)
|
|
|
|
|
2011-07-26 08:52:24 +00:00
|
|
|
# k8 so inline assembler knows about SSE
|
|
|
|
$(B)/ded/%.o: $(ASMDIR)/%.c
|
|
|
|
$(DO_CC) -march=k8
|
|
|
|
|
2011-02-18 14:31:32 +00:00
|
|
|
$(B)/ded/%.o: $(SDIR)/%.c
|
|
|
|
$(DO_DED_CC)
|
|
|
|
|
|
|
|
$(B)/ded/%.o: $(CMDIR)/%.c
|
|
|
|
$(DO_DED_CC)
|
|
|
|
|
|
|
|
$(B)/ded/%.o: $(ZDIR)/%.c
|
|
|
|
$(DO_DED_CC)
|
|
|
|
|
|
|
|
$(B)/ded/%.o: $(BLIBDIR)/%.c
|
|
|
|
$(DO_BOT_CC)
|
|
|
|
|
|
|
|
$(B)/ded/%.o: $(SYSDIR)/%.c
|
|
|
|
$(DO_DED_CC)
|
|
|
|
|
|
|
|
$(B)/ded/%.o: $(SYSDIR)/%.m
|
|
|
|
$(DO_DED_CC)
|
|
|
|
|
|
|
|
$(B)/ded/%.o: $(SYSDIR)/%.rc
|
|
|
|
$(DO_WINDRES)
|
|
|
|
|
|
|
|
$(B)/ded/%.o: $(NDIR)/%.c
|
|
|
|
$(DO_DED_CC)
|
|
|
|
|
|
|
|
# Extra dependencies to ensure the SVN version is incorporated
|
|
|
|
ifeq ($(USE_SVN),1)
|
|
|
|
$(B)/client/cl_console.o : .svn/entries
|
|
|
|
$(B)/client/common.o : .svn/entries
|
|
|
|
$(B)/ded/common.o : .svn/entries
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
## GAME MODULE RULES
|
|
|
|
#############################################################################
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/cgame/bg_%.o: $(GDIR)/bg_%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_CC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/cgame/%.o: $(CGDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_CC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/cgame/bg_%.asm: $(GDIR)/bg_%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_Q3LCC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/cgame/%.asm: $(CGDIR)/%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_Q3LCC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/cgame/bg_%.o: $(GDIR)/bg_%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_CC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/cgame/%.o: $(CGDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_CC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/cgame/bg_%.asm: $(GDIR)/bg_%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_Q3LCC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/cgame/%.asm: $(CGDIR)/%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_CGAME_Q3LCC_MISSIONPACK)
|
|
|
|
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/game/%.o: $(GDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_GAME_CC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/game/%.asm: $(GDIR)/%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_GAME_Q3LCC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/game/%.o: $(GDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_GAME_CC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/game/%.asm: $(GDIR)/%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_GAME_Q3LCC_MISSIONPACK)
|
|
|
|
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/ui/bg_%.o: $(GDIR)/bg_%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_UI_CC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/ui/%.o: $(Q3UIDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_UI_CC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/ui/bg_%.asm: $(GDIR)/bg_%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_UI_Q3LCC)
|
|
|
|
|
|
|
|
$(B)/baseq3r/ui/%.asm: $(Q3UIDIR)/%.c $(Q3LCC)
|
|
|
|
$(DO_UI_Q3LCC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/ui/bg_%.o: $(GDIR)/bg_%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_UI_CC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/ui/%.o: $(UIDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_UI_CC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/ui/bg_%.asm: $(GDIR)/bg_%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_UI_Q3LCC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/ui/%.asm: $(UIDIR)/%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_UI_Q3LCC_MISSIONPACK)
|
|
|
|
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/qcommon/%.o: $(CMDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_SHLIB_CC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(BASEGAME)/qcommon/%.asm: $(CMDIR)/%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_Q3LCC)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/qcommon/%.o: $(CMDIR)/%.c
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_SHLIB_CC_MISSIONPACK)
|
|
|
|
|
2011-12-10 00:15:42 +00:00
|
|
|
$(B)/$(MISSIONPACK)/qcommon/%.asm: $(CMDIR)/%.c $(Q3LCC)
|
2011-02-18 14:31:32 +00:00
|
|
|
$(DO_Q3LCC_MISSIONPACK)
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# MISC
|
|
|
|
#############################################################################
|
|
|
|
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
OBJ = $(Q3OBJ) $(Q3ROBJ) $(Q3R2OBJ) $(Q3RPOBJ_UP) $(Q3RPOBJ_SMP) $(Q3DOBJ) $(JPGOBJ) \
|
2011-02-18 14:31:32 +00:00
|
|
|
$(MPGOBJ) $(Q3GOBJ) $(Q3CGOBJ) $(MPCGOBJ) $(Q3UIOBJ) $(MPUIOBJ) \
|
|
|
|
$(MPGVMOBJ) $(Q3GVMOBJ) $(Q3CGVMOBJ) $(MPCGVMOBJ) $(Q3UIVMOBJ) $(MPUIVMOBJ)
|
|
|
|
TOOLSOBJ = $(LBURGOBJ) $(Q3CPPOBJ) $(Q3RCCOBJ) $(Q3LCCOBJ) $(Q3ASMOBJ)
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
STRINGOBJ = $(Q3R2STRINGOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
copyfiles: release
|
2012-09-15 03:03:44 +00:00
|
|
|
@if [ ! -d $(COPYDIR)/$(BASEGAME) ]; then echo "You need to set COPYDIR to where your Quake3 data is!"; fi
|
2011-12-10 00:15:42 +00:00
|
|
|
ifneq ($(BUILD_GAME_SO),0)
|
|
|
|
ifneq ($(BUILD_BASEGAME),0)
|
|
|
|
-$(MKDIR) -p -m 0755 $(COPYDIR)/$(BASEGAME)
|
|
|
|
endif
|
|
|
|
ifneq ($(BUILD_MISSIONPACK),0)
|
|
|
|
-$(MKDIR) -p -m 0755 $(COPYDIR)/$(MISSIONPACK)
|
|
|
|
endif
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifneq ($(BUILD_CLIENT),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(CLIENTBIN)$(FULLBINEXT) $(COPYBINDIR)/$(CLIENTBIN)$(FULLBINEXT)
|
|
|
|
ifneq ($(USE_RENDERER_DLOPEN),0)
|
2011-08-10 21:14:44 +00:00
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl1_$(SHLIBNAME)
|
ioquake3 resync to revision 2369 from 2317.
Some revision messages:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.
Play correct team sounds when in spectator mode and following a player.
Check last listener number instead of clc.clientNum in S_AL_HearingThroughEntity so sound work correctly when spectate following a client. (Related to bug 5741.)
When in third person, don't play player's sounds as full volume in Base sound system. OpenAL already does this. (Related to bug 5741.)
really fix the confusion with game entity and refentity numbers
to further reduce confusion, rename constants like MAX_ENTITIES to MAX_REFENTITIES
Added Rend2, an alternate renderer. (Bug #4358)
Fix restoring fs_game when default.cfg is missing.
Fix restoring old fs_game upon leaving a server. Patch by Ensiform.
Change more operator commands to require sv_running to be usable. Patch by Ensiform.
Fix some "> MAX_*" to be ">= MAX_*".
Fix follow command to find clients whose name begins with a number.
Fix up "gc" command, make it more like "tell". Based on patch by Ensiform.
Add usage messages for gc, tell, vtell, and votell commands.
Check player names in gc, tell, vtell, and votell commands.
#5799 - Change messagemode text box to display colors like in console input box.
Improve "play" command, based on a patch from Ensiform.
Check for invalid filename in OpenAL's RegisterSound function.
Changed Base sound system to warn not error when sound filename is empty or too long.
Remove references to non-existent functions CM_MarkFragments and CM_LerpTag.
2012-12-06 07:07:19 +00:00
|
|
|
ifneq ($(BUILD_RENDERER_REND2),0)
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_rend2_$(SHLIBNAME) $(COPYBINDIR)/renderer_rend2_$(SHLIBNAME)
|
|
|
|
endif
|
2011-12-10 00:15:42 +00:00
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
# Don't copy the SMP until it's working together with SDL.
|
2011-08-10 21:14:44 +00:00
|
|
|
ifneq ($(BUILD_CLIENT_SMP),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
ifneq ($(USE_RENDERER_DLOPEN),0)
|
2011-08-10 21:14:44 +00:00
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1_smp_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl1_smp_$(SHLIBNAME)
|
2011-12-10 00:15:42 +00:00
|
|
|
else
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(CLIENTBIN)-smp$(FULLBINEXT) $(COPYBINDIR)/$(CLIENTBIN)-smp$(FULLBINEXT)
|
|
|
|
endif
|
2011-08-10 21:14:44 +00:00
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
ifneq ($(BUILD_SERVER),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
@if [ -f $(BR)/$(SERVERBIN)$(FULLBINEXT) ]; then \
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(SERVERBIN)$(FULLBINEXT) $(COPYBINDIR)/$(SERVERBIN)$(FULLBINEXT); \
|
2011-02-18 14:31:32 +00:00
|
|
|
fi
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(BUILD_GAME_SO),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
ifneq ($(BUILD_BASEGAME),0)
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame$(SHLIBNAME) \
|
|
|
|
$(COPYDIR)/$(BASEGAME)/.
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame$(SHLIBNAME) \
|
|
|
|
$(COPYDIR)/$(BASEGAME)/.
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui$(SHLIBNAME) \
|
|
|
|
$(COPYDIR)/$(BASEGAME)/.
|
|
|
|
endif
|
2011-02-18 14:31:32 +00:00
|
|
|
ifneq ($(BUILD_MISSIONPACK),0)
|
2011-12-10 00:15:42 +00:00
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(MISSIONPACK)/cgame$(SHLIBNAME) \
|
|
|
|
$(COPYDIR)/$(MISSIONPACK)/.
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(MISSIONPACK)/qagame$(SHLIBNAME) \
|
|
|
|
$(COPYDIR)/$(MISSIONPACK)/.
|
|
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(MISSIONPACK)/ui$(SHLIBNAME) \
|
|
|
|
$(COPYDIR)/$(MISSIONPACK)/.
|
2011-02-18 14:31:32 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
clean: clean-debug clean-release
|
|
|
|
ifeq ($(PLATFORM),mingw32)
|
|
|
|
@$(MAKE) -C $(NSISDIR) clean
|
|
|
|
else
|
|
|
|
@$(MAKE) -C $(LOKISETUPDIR) clean
|
|
|
|
endif
|
|
|
|
|
|
|
|
clean-debug:
|
|
|
|
@$(MAKE) clean2 B=$(BD)
|
|
|
|
|
|
|
|
clean-release:
|
|
|
|
@$(MAKE) clean2 B=$(BR)
|
|
|
|
|
|
|
|
clean2:
|
|
|
|
@echo "CLEAN $(B)"
|
|
|
|
@rm -f $(OBJ)
|
|
|
|
@rm -f $(OBJ_D_FILES)
|
ioquake3 resync to revision 2398 from 2369.
This is the last ioquake3 revision before ioquake3 changed from subversion to git at the beginning of 2013.
#5808 - Include and use .glsl in source (rend2)
#5812 - Use refdef's coordinates when drawing to screen shadow fbo, and separate depth texture and screen texture coordinates in glsl shaders.
Include Rend2 renderer in MacOSX bundle
Include OpenGL1 and Rend2 renderers in MacOSX UB
Include Rend2 renderer in NSIS installer.
Include OpenGL1 and Rend2 renderers in Loki Setup Installer.
Have NSIS uninstaller delete rend2.
Split light sample into direct and ambient parts when using deluxemaps or per-vertex light vectors. Fixes #5813.
Fix writting voip data in demos (broke in r2102).
Fix server ignoring client move commands if voip data is included.
Allow changing cl_voip without restarting.
Fix assert failing in CL_ParseVoip() while flipping cl_voip off and on.
Only declare var_SampleToView in lightall shader when it is actually used.
Fix a couple files not ending with a newline.
Fix clients being able to reset their player state and respawn using donedl.
Fix passing arg9 (qvm only), arg10, and arg11 to vmMain for native libs and non-i386 compiled or interpated qvms. (Currently they aren't use in vmMain in game, cgame, or ui.)
Fix passing args[11] to args[15] from vm to engine on ppc64 and sparc64. Some of the args are used by game bot prediction syscalls. May have been causing bugs. Note: This was fixed for x86_64 in r2163.
Fix reconnect command to work after leaving server. (#5794)
Fix dedicated server crashing when using MSG_ReadDelta*, though it only happens if someone modifies the engine. (#5449)
Makefile fixes for OpenBSD by Jonathan Gray. (#5728)
Save all arguments from connect for reconnect command.
Remove unnecessary localhost check from reconnect command.
Support r_srgb even without hardware support. Also tweak default autoexposure/tonemap settings to look good on both r_srgb 0 and 1.
Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries
Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Fix bot skill format so it doesn't always have a space at the beginning of it.
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are
Lets list all the valid options.
2017-07-09 21:21:12 +00:00
|
|
|
@rm -f $(STRINGOBJ)
|
2011-02-18 14:31:32 +00:00
|
|
|
@rm -f $(TARGETS)
|
|
|
|
|
|
|
|
toolsclean: toolsclean-debug toolsclean-release
|
|
|
|
|
|
|
|
toolsclean-debug:
|
|
|
|
@$(MAKE) toolsclean2 B=$(BD)
|
|
|
|
|
|
|
|
toolsclean-release:
|
|
|
|
@$(MAKE) toolsclean2 B=$(BR)
|
|
|
|
|
|
|
|
toolsclean2:
|
|
|
|
@echo "TOOLS_CLEAN $(B)"
|
|
|
|
@rm -f $(TOOLSOBJ)
|
|
|
|
@rm -f $(TOOLSOBJ_D_FILES)
|
|
|
|
@rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM)
|
|
|
|
|
|
|
|
distclean: clean toolsclean
|
|
|
|
@rm -rf $(BUILD_DIR)
|
|
|
|
|
|
|
|
installer: release
|
|
|
|
ifeq ($(PLATFORM),mingw32)
|
2011-12-10 00:15:42 +00:00
|
|
|
@$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) \
|
2012-09-15 03:03:44 +00:00
|
|
|
SDLDLL=$(SDLDLL) \
|
2011-12-10 00:15:42 +00:00
|
|
|
USE_RENDERER_DLOPEN=$(USE_RENDERER_DLOPEN) \
|
|
|
|
USE_OPENAL_DLOPEN=$(USE_OPENAL_DLOPEN) \
|
|
|
|
USE_CURL_DLOPEN=$(USE_CURL_DLOPEN) \
|
|
|
|
USE_INTERNAL_SPEEX=$(USE_INTERNAL_SPEEX) \
|
|
|
|
USE_INTERNAL_ZLIB=$(USE_INTERNAL_ZLIB) \
|
|
|
|
USE_INTERNAL_JPEG=$(USE_INTERNAL_JPEG)
|
2011-02-18 14:31:32 +00:00
|
|
|
else
|
|
|
|
@$(MAKE) VERSION=$(VERSION) -C $(LOKISETUPDIR) V=$(V)
|
|
|
|
endif
|
|
|
|
|
|
|
|
dist:
|
2011-12-10 00:15:42 +00:00
|
|
|
rm -rf $(CLIENTBIN)-$(VERSION)
|
|
|
|
svn export . $(CLIENTBIN)-$(VERSION)
|
|
|
|
tar --owner=root --group=root --force-local -cjf $(CLIENTBIN)-$(VERSION).tar.bz2 $(CLIENTBIN)-$(VERSION)
|
|
|
|
rm -rf $(CLIENTBIN)-$(VERSION)
|
2011-02-18 14:31:32 +00:00
|
|
|
|
|
|
|
#############################################################################
|
|
|
|
# DEPENDENCIES
|
|
|
|
#############################################################################
|
|
|
|
|
|
|
|
ifneq ($(B),)
|
|
|
|
OBJ_D_FILES=$(filter %.d,$(OBJ:%.o=%.d))
|
|
|
|
TOOLSOBJ_D_FILES=$(filter %.d,$(TOOLSOBJ:%.o=%.d))
|
|
|
|
-include $(OBJ_D_FILES) $(TOOLSOBJ_D_FILES)
|
|
|
|
endif
|
|
|
|
|
|
|
|
.PHONY: all clean clean2 clean-debug clean-release copyfiles \
|
|
|
|
debug default dist distclean installer makedirs \
|
|
|
|
release targets \
|
|
|
|
toolsclean toolsclean2 toolsclean-debug toolsclean-release \
|
|
|
|
$(OBJ_D_FILES) $(TOOLSOBJ_D_FILES)
|