blob: 4c728fc7c5fc014cf83f6240fca99186d7f3639c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- Makefile.old 2010-09-09 11:30:26.000000000 +0200
+++ Makefile 2010-09-09 11:33:41.000000000 +0200
@@ -253,7 +253,7 @@
SHLIBLDFLAGS=-shared $(LDFLAGS)
THREAD_LDFLAGS=-lpthread
- LDFLAGS=-ldl -lm
+ LDLIBS=-ldl -lm
ifeq ($(USE_SDL),1)
CLIENT_LDFLAGS=$(shell sdl-config --libs)
@@ -1069,13 +1069,13 @@
$(B)/tremulous.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
@echo "LD $@"
- @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
- $(LDFLAGS) $(LIBSDLMAIN)
+ @$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
+ $(LDLIBS) $(LIBSDLMAIN)
$(B)/tremulous-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
@echo "LD $@"
- @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
+ @$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
+ $(THREAD_LDFLAGS) $(LDLIBS) $(LIBSDLMAIN)
ifneq ($(strip $(LIBSDLMAIN)),)
ifneq ($(strip $(LIBSDLMAINSRC)),)
@@ -1153,7 +1153,7 @@
$(B)/tremded.$(ARCH)$(BINEXT): $(Q3DOBJ)
@echo "LD $@"
- @$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
+ @$(CC) -o $@ $(LDFLAGS) $(Q3DOBJ) $(LDLIBS)
|
GitWeb
