|
Lines 26-32
Link Here
|
| 26 |
|
26 |
|
| 27 |
#most current glibc systems implicitly contain libintl.so |
27 |
#most current glibc systems implicitly contain libintl.so |
| 28 |
ifndef IMPLICIT_LIBINTL |
28 |
ifndef IMPLICIT_LIBINTL |
| 29 |
IMPLICIT_LIBINTL:=NO |
29 |
IMPLICIT_LIBINTL:=YES |
| 30 |
endif |
30 |
endif |
| 31 |
|
31 |
|
| 32 |
# Is this a cross compile? |
32 |
# Is this a cross compile? |
|
Lines 112-118
Link Here
|
| 112 |
# heavy optimization |
112 |
# heavy optimization |
| 113 |
#ADD_CFLAGS:=$(ADD_CFLAGS) -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
113 |
#ADD_CFLAGS:=$(ADD_CFLAGS) -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
| 114 |
# !!!! -fomit-frame-pointer breaks execeptions !!!! |
114 |
# !!!! -fomit-frame-pointer breaks execeptions !!!! |
| 115 |
ADD_CFLAGS:=$(ADD_CFLAGS) -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations |
|
|
| 116 |
else |
115 |
else |
| 117 |
ifeq ($(BUILD),profile) |
116 |
ifeq ($(BUILD),profile) |
| 118 |
OPTIMIZE:=yes |
117 |
OPTIMIZE:=yes |
|
Lines 151-159
Link Here
|
| 151 |
# Object files and directories, final compilation flags |
150 |
# Object files and directories, final compilation flags |
| 152 |
|
151 |
|
| 153 |
OBJECT_DIR:=src/$(TARGET)-$(BUILD) |
152 |
OBJECT_DIR:=src/$(TARGET)-$(BUILD) |
| 154 |
CFLAGS:=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) |
153 |
CXXFLAGS+=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) |
| 155 |
CXXFLAGS:=$(CFLAGS) |
154 |
LDFLAGS+=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net |
| 156 |
LDFLAGS:=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lSDL_gfx |
|
|
| 157 |
|
155 |
|
| 158 |
############################################################################## |
156 |
############################################################################## |
| 159 |
# Building |
157 |
# Building |
|
Lines 208-220
Link Here
|
| 208 |
|
206 |
|
| 209 |
$(OBJECT_DIR)/widelands: $(OBJ) |
207 |
$(OBJECT_DIR)/widelands: $(OBJ) |
| 210 |
@echo "===> LD $@" |
208 |
@echo "===> LD $@" |
| 211 |
$(Q)$(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CFLAGS) |
209 |
$(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CXXFLAGS) |
| 212 |
|
210 |
|
| 213 |
-include $(DEP) |
211 |
-include $(DEP) |
| 214 |
|
212 |
|
| 215 |
$(OBJECT_DIR)/%.o: src/%.cc src/build_id.h src/config.h |
213 |
$(OBJECT_DIR)/%.o: src/%.cc src/build_id.h src/config.h |
| 216 |
@echo "===> CXX $<" |
214 |
@echo "===> CXX $<" |
| 217 |
$(Q)$(CXX) -pipe $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< |
215 |
$(CXX) $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< |
| 218 |
$(Q)sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' $@.d > $(OBJECT_DIR)/$*.d |
216 |
$(Q)sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' $@.d > $(OBJECT_DIR)/$*.d |
| 219 |
$(Q)rm $@.d |
217 |
$(Q)rm $@.d |
| 220 |
|
218 |
|
