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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
From: Julian Ospald <hasufell@gentoo.org>
Date: Fri Oct 5 13:55:07 UTC 2012
Subject: build system
respect flags and compiler
--- source/Makefile
+++ source/Makefile
@@ -112,7 +112,7 @@
else
-CFOPTIMIZE := -O2
+CFOPTIMIZE := $(CXXFLAGS)
endif # USE_ICC
@@ -120,21 +120,19 @@
CFOPTIMIZE += -flto=jobserver -fwhole-program
endif
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+CFOTHERS := $(EXTERNAL_FLAGS)
CFWARN := -Wall -Wformat-security
CFWARN_L := -Wundef
DEFINES := $(EXTERNAL_DEFINES)
-LDFLAGS := $(EXTERNAL_LDFLAGS)
-
#
# The GCC and GXX variables are set later.
#
-AR = ar
-RANLIB = ranlib
-CC = $(GCC)
-CXX = $(GXX)
+AR ?= ar
+RANLIB ?= ranlib
+CC ?= $(GCC)
+CXX ?= $(GXX)
RM = rm -f
COPY = cp
COPY_R = cp -r
@@ -145,7 +143,7 @@
PNGCRUSH = $(COPY)
PNGCRUSH_LABEL = COPY
ADVPNG = advpng -z -4
-PKGCONFIG = pkg-config
+PKGCONFIG ?= pkg-config
DOXYGEN = doxygen
DOXYGEN_SIMPLE_CONF = crawl_simple.doxy
DOXYGEN_ALL_CONF = crawl_all.doxy
@@ -1228,7 +1226,6 @@
endif
[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
mkdir -p $(datadir_fp)/dat/des
mkdir -p $(datadir_fp)/dat/dlua
mkdir -p $(datadir_fp)/dat/clua
@@ -1570,7 +1567,7 @@
.PHONY: build-rltiles
build-rltiles: .contrib-libs $(RLTILES)/dc-unrand.txt
- +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES)
+ +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES)
$(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
--- source/rltiles/Makefile
+++ source/rltiles/Makefile
@@ -1,7 +1,7 @@
uname_S := $(shell uname -s)
ifneq (,$(findstring MINGW,$(uname_S)))
-LDFLAGS += -lmingw32
+LIBS += -lmingw32
endif
# Note: since generation of tiles is done on the host, we don't care about
@@ -10,7 +10,7 @@
# Also, cross-compilation with no system libraries for host rather than target
# is not supported. If host=target, contribs are enough.
-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
+CXXFLAGS += -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
ifdef TILES
ifndef CONTRIB_SDL
@@ -29,24 +29,24 @@
PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
endif
- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
+ CXXFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
+ LIBS += $(SDL_LDFLAGS) $(PNG_LIB)
- CFLAGS += -DUSE_TILE
+ CXXFLAGS += -DUSE_TILE
endif
ifdef DEBUG
-CFLAGS += -O0 -DDEBUG -ggdb
+CXXFLAGS += -DDEBUG
endif
ifneq (,$(findstring MINGW,$(uname_S)))
-LDFLAGS += -lgdi32 -lwinmm
+LIBS += -lgdi32 -lwinmm
endif
ifeq ($(uname_S),Darwin)
LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
endif
ifeq ($(uname_S),Linux)
-LDFLAGS += -ldl -lpthread
+LIBS += -ldl -lpthread
endif
# Attempt to use a full compiler name, to make
@@ -127,9 +127,9 @@
distclean: clean
%.o: %.cc .cflags
- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@
+ $(CXX) $(CXXFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
$(TILEGEN): $(OBJECTS)
- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
+ $(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
.PHONY: all clean distclean
|
GitWeb