| 1 |
--- ./Makefile.orig Sun Dec 31 14:01:34 2006 |
| 2 |
+++ ./Makefile Fri Jan 5 15:51:35 2007 |
| 3 |
@@ -9,7 +9,7 @@ |
| 4 |
|
| 5 |
# Check OS type. |
| 6 |
OSTYPE= $(shell uname -s | tr A-Z a-z) |
| 7 |
-ARCH= $(shell uname -m | sed -e s/i.86/i386/) |
| 8 |
+ARCH?= $(shell uname -m | sed -e s/i.86/i386/) |
| 9 |
MARCH= $(shell uname -m) |
| 10 |
OP_SYSTEM= $(shell uname -sr) |
| 11 |
|
| 12 |
@@ -27,75 +27,75 @@ BUILD_RELEASE_DIR:=build_release |
| 13 |
# verbose compilation # |
| 14 |
# process. # |
| 15 |
#===========================# |
| 16 |
-VERBOSE=NO |
| 17 |
+VERBOSE=YES |
| 18 |
|
| 19 |
#===========================# |
| 20 |
# Q2P Client # |
| 21 |
#===========================# |
| 22 |
-BUILD_Q2P=YES |
| 23 |
+BUILD_Q2P?=NO |
| 24 |
|
| 25 |
#===========================# |
| 26 |
# Enable Optimizations. # |
| 27 |
# Release build only. # |
| 28 |
#===========================# |
| 29 |
-OPTIMIZE=NO |
| 30 |
+OPTIMIZE?=NO |
| 31 |
|
| 32 |
#===========================# |
| 33 |
# Remove symbols from # |
| 34 |
# binaries, reduce size. # |
| 35 |
# Release build only. # |
| 36 |
#===========================# |
| 37 |
-STRIP=YES |
| 38 |
+STRIP?=YES |
| 39 |
|
| 40 |
#===========================# |
| 41 |
# Sound Drivers # |
| 42 |
#===========================# |
| 43 |
ifeq ($(OSTYPE),linux) |
| 44 |
-BUILD_ALSA_SND=YES |
| 45 |
+BUILD_ALSA_SND?=NO |
| 46 |
endif |
| 47 |
-BUILD_OSS_SND=YES |
| 48 |
-BUILD_SDL_SND=YES |
| 49 |
+BUILD_OSS_SND?=NO |
| 50 |
+BUILD_SDL_SND?=NO |
| 51 |
|
| 52 |
#===========================# |
| 53 |
# Quake 2 dedicated server. # |
| 54 |
#===========================# |
| 55 |
-BUILD_DEDICATED=YES |
| 56 |
+BUILD_DEDICATED?=NO |
| 57 |
|
| 58 |
#===========================# |
| 59 |
# GLX, SDL-GLX # |
| 60 |
# render. # |
| 61 |
#===========================# |
| 62 |
-BUILD_GLX=YES |
| 63 |
-BUILD_SDLGL=YES |
| 64 |
+BUILD_GLX?=NO |
| 65 |
+BUILD_SDLGL?=NO |
| 66 |
|
| 67 |
#===========================# |
| 68 |
# Linked To GLU library. # |
| 69 |
#===========================# |
| 70 |
-WITH_GLULIB=YES |
| 71 |
+WITH_GLULIB?=YES |
| 72 |
|
| 73 |
#===========================# |
| 74 |
# Built in DGA mouse # |
| 75 |
# support. # |
| 76 |
#===========================# |
| 77 |
-WITH_XF86_DGA=NO |
| 78 |
+WITH_XF86_DGA?=YES |
| 79 |
|
| 80 |
#===========================# |
| 81 |
# Read from $(DATADIR) and # |
| 82 |
# write to "~/.quake2" # |
| 83 |
#===========================# |
| 84 |
-WITH_DATADIR=NO |
| 85 |
+WITH_DATADIR?=YES |
| 86 |
|
| 87 |
#===========================# |
| 88 |
# Load renderers # |
| 89 |
# from $(LIBDIR) # |
| 90 |
#===========================# |
| 91 |
-WITH_LIBDIR=NO |
| 92 |
+WITH_LIBDIR?=YES |
| 93 |
|
| 94 |
#===========================# |
| 95 |
# Built in CD Audio # |
| 96 |
# support. # |
| 97 |
#===========================# |
| 98 |
-WITH_CDAUDIO=NO |
| 99 |
+WITH_CDAUDIO?=YES |
| 100 |
ifeq ($(OSTYPE),freebsd) |
| 101 |
CD_API=cd_freebsd.c |
| 102 |
endif |
| 103 |
@@ -107,22 +107,19 @@ endif |
| 104 |
# Enable XMMS/Audacious # |
| 105 |
# support. Only one of them # |
| 106 |
# at same time. # |
| 107 |
-# No yet for FreeBSD :( # |
| 108 |
#===========================# |
| 109 |
-ifeq ($(OSTYPE),linux) |
| 110 |
-WITH_AUDACIOUS=YES |
| 111 |
-WITH_XMMS=NO |
| 112 |
-endif |
| 113 |
+WITH_AUDACIOUS?=NO |
| 114 |
+WITH_XMMS?=NO |
| 115 |
|
| 116 |
#===========================# |
| 117 |
# Quake 2 game library. # |
| 118 |
#===========================# |
| 119 |
-BUILD_GAME=YES |
| 120 |
+BUILD_GAME?=NO |
| 121 |
|
| 122 |
#===========================# |
| 123 |
# CTF Library. # |
| 124 |
#===========================# |
| 125 |
-BUILD_CTF=YES |
| 126 |
+BUILD_CTF?=NO |
| 127 |
|
| 128 |
|
| 129 |
CLIENT_DIR=$(MOUNT_DIR)/client |
| 130 |
@@ -133,24 +130,24 @@ UNIX_DIR=$(MOUNT_DIR)/unix |
| 131 |
GAME_DIR=$(MOUNT_DIR)/game |
| 132 |
CTF_DIR=$(MOUNT_DIR)/ctf |
| 133 |
|
| 134 |
-CC=gcc |
| 135 |
+CC?=gcc |
| 136 |
CC_VERSION=$(shell $(CC) -dumpversion) |
| 137 |
|
| 138 |
-X11BASE= /usr/X11R6 |
| 139 |
-LOCALBASE= /usr/local |
| 140 |
-GAMEBASE= /usr/local |
| 141 |
-SYSBINDIR=$(LOCALBASE)/bin |
| 142 |
+X11BASE?= /usr/local |
| 143 |
+LOCALBASE?= /usr/local |
| 144 |
+GAMEBASE?= $(PREFIX) |
| 145 |
+SYSBINDIR?= $(PREFIX)/bin |
| 146 |
|
| 147 |
ifeq ($(OSTYPE),freebsd) |
| 148 |
- DATADIR= $(GAMEBASE)/share/quake2 |
| 149 |
- LIBDIR= $(GAMEBASE)/lib/quake2 |
| 150 |
+ DATADIR?= $(GAMEBASE)/share/quake2 |
| 151 |
+ LIBDIR?= $(GAMEBASE)/lib/quake2 |
| 152 |
else |
| 153 |
- DATADIR= $(GAMEBASE)/games/quake2 |
| 154 |
- LIBDIR= $(GAMEBASE)/games/quake2 |
| 155 |
+ DATADIR?= $(GAMEBASE)/games/quake2 |
| 156 |
+ LIBDIR?= $(GAMEBASE)/games/quake2 |
| 157 |
endif |
| 158 |
|
| 159 |
SHLIB_EXT=so |
| 160 |
-GAME_NAME=game$(ARCH).$(SHLIB_EXT) |
| 161 |
+GAME_NAME=game.$(SHLIB_EXT) |
| 162 |
|
| 163 |
BASE_CFLAGS+=-I$(LOCALBASE)/include \ |
| 164 |
-I$(X11BASE)/include \ |
| 165 |
@@ -168,15 +165,11 @@ RELEASE_CFLAGS+=$(BASE_CFLAGS) \ |
| 166 |
|
| 167 |
ifeq ($(strip $(OPTIMIZE)),YES) |
| 168 |
RELEASE_CFLAGS+=-O3 \ |
| 169 |
- -march=$(MARCH) \ |
| 170 |
-funroll-loops \ |
| 171 |
-fstrength-reduce \ |
| 172 |
-fexpensive-optimizations \ |
| 173 |
- -falign-loops=2 \ |
| 174 |
- -falign-jumps=2 \ |
| 175 |
- -falign-functions=2 |
| 176 |
-else |
| 177 |
- RELEASE_CFLAGS+=-O2 |
| 178 |
+ -fomit-frame-pointer \ |
| 179 |
+ -ffast-math |
| 180 |
endif |
| 181 |
|
| 182 |
ifeq ($(strip $(STRIP)),YES) |
| 183 |
@@ -263,7 +256,7 @@ ifeq ($(strip $(BUILD_Q2P)),YES) |
| 184 |
endif |
| 185 |
|
| 186 |
ifeq ($(strip $(BUILD_DEDICATED)),YES) |
| 187 |
- TARGETS += $(BINDIR)/q2p-dedicated |
| 188 |
+ TARGETS += $(BINDIR)/q2p-ded |
| 189 |
DED_CFLAGS += -DDEDICATED_ONLY |
| 190 |
endif |
| 191 |
|
| 192 |
@@ -292,11 +285,11 @@ ifeq ($(strip $(BUILD_SDLGL)),YES) |
| 193 |
endif |
| 194 |
|
| 195 |
ifeq ($(strip $(BUILD_GAME)),YES) |
| 196 |
- TARGETS+=$(BINDIR)/baseq2/game$(ARCH).$(SHLIB_EXT) |
| 197 |
+ TARGETS+=$(BINDIR)/baseq2/game.$(SHLIB_EXT) |
| 198 |
endif |
| 199 |
|
| 200 |
ifeq ($(strip $(BUILD_CTF)),YES) |
| 201 |
- TARGETS+=$(BINDIR)/ctf/game$(ARCH).$(SHLIB_EXT) |
| 202 |
+ TARGETS+=$(BINDIR)/ctf/game.$(SHLIB_EXT) |
| 203 |
endif |
| 204 |
|
| 205 |
all: |
| 206 |
@@ -585,7 +578,7 @@ $(BUILDDIR)/ded/sh_unix.o $(BUILDDIR)/d |
| 207 |
$(BUILDDIR)/ded/q_shared.o $(BUILDDIR)/ded/pmove.o \ |
| 208 |
$(BUILDDIR)/ded/cl_null.o $(BUILDDIR)/ded/cd_null.o |
| 209 |
|
| 210 |
-$(BINDIR)/q2p-dedicated : $(Q2PDED_OBJS) |
| 211 |
+$(BINDIR)/q2p-ded : $(Q2PDED_OBJS) |
| 212 |
@echo |
| 213 |
@echo "**Built Q2P dedicated client with cflags:" |
| 214 |
@echo "$(CC) $(CC_VERSION)"; |
| 215 |
@@ -709,7 +702,7 @@ $(BUILDDIR)/game/m_parasite.o $(BUILDDIR |
| 216 |
$(BUILDDIR)/game/m_tank.o $(BUILDDIR)/game/p_hud.o $(BUILDDIR)/game/p_trail.o \ |
| 217 |
$(BUILDDIR)/game/p_view.o $(BUILDDIR)/game/p_weapon.o $(BUILDDIR)/game/m_flash.o |
| 218 |
|
| 219 |
-$(BINDIR)/baseq2/game$(ARCH).$(SHLIB_EXT) : $(GAME_OBJS) |
| 220 |
+$(BINDIR)/baseq2/game.$(SHLIB_EXT) : $(GAME_OBJS) |
| 221 |
@echo |
| 222 |
@echo "**Built $@ with cflags:" |
| 223 |
@echo "$(CC) $(CC_VERSION) $(CFLAGS)"; |
| 224 |
@@ -784,7 +777,7 @@ $(BUILDDIR)/ctf/m_move.o $(BUILDDIR)/ |
| 225 |
$(BUILDDIR)/ctf/p_menu.o $(BUILDDIR)/ctf/p_trail.o $(BUILDDIR)/ctf/p_view.o \ |
| 226 |
$(BUILDDIR)/ctf/p_weapon.o $(BUILDDIR)/ctf/q_shared.o |
| 227 |
|
| 228 |
-$(BINDIR)/ctf/game$(ARCH).$(SHLIB_EXT) : $(CTF_OBJS) |
| 229 |
+$(BINDIR)/ctf/game.$(SHLIB_EXT) : $(CTF_OBJS) |
| 230 |
@echo |
| 231 |
@echo "**Built $@ with cflags:" |
| 232 |
@echo "$(CC) $(CC_VERSION) $(CFLAGS)"; |
| 233 |
@@ -935,4 +928,4 @@ bz2: |
| 234 |
@tar cjvf $(Q2P_VERSION_BZ2)-$(OSTYPE)-$(DATE).tar.bz2 $(BINDIR) |
| 235 |
@printf ".... Done.\n" |
| 236 |
|
| 237 |
- |
| 238 |
\ No newline at end of file |
| 239 |
+ |
Parent Directory
| 
Revision Log