|
Line
Link Here
|
| 0 |
-- Makefile |
0 |
++ Makefile |
|
Lines 29-35
Link Here
|
| 29 |
|
29 |
|
| 30 |
#most current glibc systems implicitly contain libintl.so |
30 |
#most current glibc systems implicitly contain libintl.so |
| 31 |
ifndef IMPLICIT_LIBINTL |
31 |
ifndef IMPLICIT_LIBINTL |
| 32 |
IMPLICIT_LIBINTL:=NO |
32 |
IMPLICIT_LIBINTL:=YES |
| 33 |
endif |
33 |
endif |
| 34 |
|
34 |
|
| 35 |
# Is this a cross compile? |
35 |
# Is this a cross compile? |
|
Lines 67-73
Link Here
|
| 67 |
# profile optimized, debugging symbols, profiling |
67 |
# profile optimized, debugging symbols, profiling |
| 68 |
# |
68 |
# |
| 69 |
ifndef BUILD |
69 |
ifndef BUILD |
| 70 |
BUILD:=debug |
70 |
BUILD:=release |
| 71 |
endif |
71 |
endif |
| 72 |
|
72 |
|
| 73 |
endif |
73 |
endif |
|
Lines 111-121
Link Here
|
| 111 |
BUILD:=$(strip $(BUILD)) |
111 |
BUILD:=$(strip $(BUILD)) |
| 112 |
|
112 |
|
| 113 |
ifeq ($(BUILD),release) |
113 |
ifeq ($(BUILD),release) |
| 114 |
OPTIMIZE:=yes |
|
|
| 115 |
# heavy optimization |
114 |
# heavy optimization |
| 116 |
#ADD_CFLAGS:=$(ADD_CFLAGS) -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
115 |
#ADD_CFLAGS:=$(ADD_CFLAGS) -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
| 117 |
# !!!! -fomit-frame-pointer breaks execeptions !!!! |
116 |
# !!!! -fomit-frame-pointer breaks execeptions !!!! |
| 118 |
ADD_CFLAGS:=$(ADD_CFLAGS) -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
|
|
| 119 |
else |
117 |
else |
| 120 |
ifeq ($(BUILD),profile) |
118 |
ifeq ($(BUILD),profile) |
| 121 |
OPTIMIZE:=yes |
119 |
OPTIMIZE:=yes |
|
Lines 154-162
Link Here
|
| 154 |
# Object files and directories, final compilation flags |
152 |
# Object files and directories, final compilation flags |
| 155 |
|
153 |
|
| 156 |
OBJECT_DIR:=src/$(TARGET)-$(BUILD) |
154 |
OBJECT_DIR:=src/$(TARGET)-$(BUILD) |
| 157 |
CFLAGS:=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) |
155 |
CXXFLAGS+=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) |
| 158 |
CXXFLAGS:=$(CFLAGS) |
156 |
LDFLAGS+=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lSDL_gfx |
| 159 |
LDFLAGS:=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lSDL_gfx |
|
|
| 160 |
|
157 |
|
| 161 |
############################################################################## |
158 |
############################################################################## |
| 162 |
# Building |
159 |
# Building |
|
Lines 219-231
Link Here
|
| 219 |
|
216 |
|
| 220 |
$(OBJECT_DIR)/widelands: $(OBJ) |
217 |
$(OBJECT_DIR)/widelands: $(OBJ) |
| 221 |
@echo "===> LD $@" |
218 |
@echo "===> LD $@" |
| 222 |
$(Q)$(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CFLAGS) |
219 |
$(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CXXFLAGS) |
| 223 |
|
220 |
|
| 224 |
-include $(DEP) |
221 |
-include $(DEP) |
| 225 |
|
222 |
|
| 226 |
$(OBJECT_DIR)/%.o: src/%.cc src/config.h |
223 |
$(OBJECT_DIR)/%.o: src/%.cc src/build_id.h src/config.h |
| 227 |
@echo "===> CXX $<" |
224 |
@echo "===> CXX $<" |
| 228 |
$(Q)$(CXX) -pipe $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< |
225 |
$(CXX) $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< |
| 229 |
$(Q)sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' $@.d > $(OBJECT_DIR)/$*.d |
226 |
$(Q)sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' $@.d > $(OBJECT_DIR)/$*.d |
| 230 |
$(Q)rm $@.d |
227 |
$(Q)rm $@.d |
| 231 |
|
228 |
|
