|
Line
Link Here
|
|
respect CFLAGS/LDFLAGS |
|
respect CFLAGS/LDFLAGS |
| 1 |
-- a/Makefile |
1 |
++ b/Makefile |
|
Lines 213-219
Link Here
|
| 213 |
endif |
213 |
endif |
| 214 |
endif |
214 |
endif |
| 215 |
|
215 |
|
| 216 |
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe |
216 |
BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes |
| 217 |
|
217 |
|
| 218 |
ifeq ($(USE_OPENAL),1) |
218 |
ifeq ($(USE_OPENAL),1) |
| 219 |
BASE_CFLAGS += -DUSE_OPENAL=1 |
219 |
BASE_CFLAGS += -DUSE_OPENAL=1 |
|
Lines 239-257
Link Here
|
| 239 |
BASE_CFLAGS += -I/usr/X11R6/include |
239 |
BASE_CFLAGS += -I/usr/X11R6/include |
| 240 |
endif |
240 |
endif |
| 241 |
|
241 |
|
| 242 |
OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer |
242 |
OPTIMIZE = |
| 243 |
|
243 |
|
| 244 |
ifeq ($(ARCH),x86_64) |
244 |
ifeq ($(ARCH),x86_64) |
| 245 |
OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ |
245 |
OPTIMIZE = |
| 246 |
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ |
|
|
| 247 |
-fstrength-reduce |
| 248 |
# experimental x86_64 jit compiler! you need GNU as |
246 |
# experimental x86_64 jit compiler! you need GNU as |
| 249 |
HAVE_VM_COMPILED = true |
247 |
HAVE_VM_COMPILED = true |
| 250 |
else |
248 |
else |
| 251 |
ifeq ($(ARCH),i386) |
249 |
ifeq ($(ARCH),i386) |
| 252 |
OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \ |
250 |
OPTIMIZE = |
| 253 |
-funroll-loops -falign-loops=2 -falign-jumps=2 \ |
|
|
| 254 |
-falign-functions=2 -fstrength-reduce |
| 255 |
HAVE_VM_COMPILED=true |
251 |
HAVE_VM_COMPILED=true |
| 256 |
else |
252 |
else |
| 257 |
ifeq ($(ARCH),ppc) |
253 |
ifeq ($(ARCH),ppc) |
|
Lines 265-271
Link Here
|
| 265 |
BASE_CFLAGS += -DNO_VM_COMPILED |
261 |
BASE_CFLAGS += -DNO_VM_COMPILED |
| 266 |
endif |
262 |
endif |
| 267 |
|
263 |
|
| 268 |
DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 |
264 |
DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) |
| 269 |
|
265 |
|
| 270 |
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) |
266 |
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) |
| 271 |
|
267 |
|
|
Lines 274-280
Link Here
|
| 274 |
SHLIBLDFLAGS=-shared $(LDFLAGS) |
270 |
SHLIBLDFLAGS=-shared $(LDFLAGS) |
| 275 |
|
271 |
|
| 276 |
THREAD_LDFLAGS=-lpthread |
272 |
THREAD_LDFLAGS=-lpthread |
| 277 |
LDFLAGS=-ldl -lm |
273 |
LDFLAGS+=-ldl -lm |
| 278 |
|
274 |
|
| 279 |
ifeq ($(USE_SDL),1) |
275 |
ifeq ($(USE_SDL),1) |
| 280 |
CLIENT_LDFLAGS=$(shell sdl-config --libs) |
276 |
CLIENT_LDFLAGS=$(shell sdl-config --libs) |
|
Lines 1158-1170
Link Here
|
| 1158 |
|
1154 |
|
| 1159 |
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
1155 |
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
| 1160 |
$(echo_cmd) "LD $@" |
1156 |
$(echo_cmd) "LD $@" |
| 1161 |
$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ |
1157 |
$(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \ |
| 1162 |
$(LDFLAGS) $(LIBSDLMAIN) |
1158 |
$(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 1163 |
|
1159 |
|
| 1164 |
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
1160 |
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
| 1165 |
$(echo_cmd) "LD $@" |
1161 |
$(echo_cmd) "LD $@" |
| 1166 |
$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
1162 |
$(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ |
| 1167 |
$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
1163 |
$(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 1168 |
|
1164 |
|
| 1169 |
ifneq ($(strip $(LIBSDLMAIN)),) |
1165 |
ifneq ($(strip $(LIBSDLMAIN)),) |
| 1170 |
ifneq ($(strip $(LIBSDLMAINSRC)),) |
1166 |
ifneq ($(strip $(LIBSDLMAINSRC)),) |
