Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 450360 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-9 / +9 lines)
Line  Link Here
0
-- sauerbraten/src/Makefile
0
++ sauerbraten/src/Makefile
Lines 1-4 Link Here
1
CXXFLAGS= -O3 -fomit-frame-pointer
1
CXXFLAGS ?= -O3 -fomit-frame-pointer
2
override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
2
override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
3
3
4
PLATFORM= $(shell uname -s)
4
PLATFORM= $(shell uname -s)
Lines 139-149 Link Here
139
	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
139
	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
140
140
141
%.h.gch: %.h
141
%.h.gch: %.h
142
	$(CXX) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
142
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
143
	$(MV) $(subst .h.gch,.tmp.h.gch,$@) $@
143
	$(MV) $(subst .h.gch,.tmp.h.gch,$@) $@
144
144
145
%-standalone.o: %.cpp
145
%-standalone.o: %.cpp
146
	$(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
146
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
147
147
148
$(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
148
$(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
149
$(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
149
$(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
Lines 168-186 Link Here
168
install: all
168
install: all
169
else
169
else
170
client:	$(CLIENT_OBJS)
170
client:	$(CLIENT_OBJS)
171
	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
171
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
172
172
173
server:	$(SERVER_OBJS)
173
server:	$(SERVER_OBJS)
174
	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
174
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
175
	
175
	
176
master: $(MASTER_OBJS)
176
master: $(MASTER_OBJS)
177
	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
177
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
178
178
179
shared/cube2font.o: shared/cube2font.c
179
shared/cube2font.o: shared/cube2font.c
180
	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
180
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
181
181
182
cube2font: shared/cube2font.o
182
cube2font: shared/cube2font.o
183
	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
183
	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
184
184
185
install: all
185
install: all
186
	cp sauer_client	../bin_unix/$(PLATFORM_PREFIX)_client
186
	cp sauer_client	../bin_unix/$(PLATFORM_PREFIX)_client

Return to bug 450360