teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-14 00:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Removed the dependancy on perl for deriving the version number

Browse source 
* Moved `sdl-config --libs` from LDFLAGS to GLLDFLAGS to prevent needlessly linking against SDL when building the dedicated server
* Moved assignment of DEBUG_CFLAGS until after BASE_CFLAGS has been constructed
This commit is contained in:
Tim Angus 2005-09-19 20:43:35 +00:00
parent 33a48a0336
commit 50eb77ed1a
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/unix/Makefile
View file

@ -67,7 +67,7 @@ JPDIR=$(MOUNT_DIR)/jpeg-6
SPLNDIR=$(MOUNT_DIR)/splines SPLNDIR=$(MOUNT_DIR)/splines
# extract version info # extract version info
VERSION=$(shell ./extract_ver.pl) VERSION=$(shell cat ../game/q_shared.h | grep Q3_VERSION | sed -e 's/.*Q3\ \(.*\)"/\1/')
RPM_RELEASE=1 RPM_RELEASE=1
# NOTE: used by dcp rcp targets, not referenced # NOTE: used by dcp rcp targets, not referenced
@ -128,13 +128,6 @@ ifeq ($(PLATFORM),linux)
GL_CFLAGS = -I/usr/X11R6/include GL_CFLAGS = -I/usr/X11R6/include
# bk001204 - need -O for -Wall for uninitialized
# bk001205 - took out -O to get assertions (NDEBUG)
# bk001206 - MALLOC_CHECK in addition to ZONE_DEBUG
# TTimo 03/30/2001 temporary took out -Werror for initial merge
DEBUG_CFLAGS = $(BASE_CFLAGS) -g
DEBUG_CFLAGS += -DNO_MOUSEGRAB
DEBUG_CFLAGS += -O0
OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer -fno-strict-aliasing OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer -fno-strict-aliasing
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fstrength-reduce -fno-strict-aliasing OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fstrength-reduce -fno-strict-aliasing
@ -150,6 +143,12 @@ ifeq ($(PLATFORM),linux)
endif endif
endif endif
# bk001204 - need -O for -Wall for uninitialized
# bk001205 - took out -O to get assertions (NDEBUG)
# bk001206 - MALLOC_CHECK in addition to ZONE_DEBUG
# TTimo 03/30/2001 temporary took out -Werror for initial merge
DEBUG_CFLAGS = $(BASE_CFLAGS) -g -DNO_MOUSEGRAB -O0
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
LIBEXT=a LIBEXT=a
@ -174,7 +173,7 @@ ifeq ($(PLATFORM),linux)
endif endif
ifeq ($(strip $(USE_SDL)),true) ifeq ($(strip $(USE_SDL)),true)
LDFLAGS+=$(shell sdl-config --libs) GLLDFLAGS+=$(shell sdl-config --libs)
endif endif
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)