| 1 |
hasufell 12/12/27 02:24:48 |
| 2 |
|
| 3 |
Modified: warsow-1.02-build.patch |
| 4 |
Log: |
| 5 |
respect CFLAGS in linking command, don't mix up CFLAGS and CXXFLAGS, improve verbosity handling |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 games-fps/warsow/files/warsow-1.02-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.02-build.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.02-build.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.02-build.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: warsow-1.02-build.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/warsow/files/warsow-1.02-build.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- warsow-1.02-build.patch 21 Oct 2012 15:43:49 -0000 1.1 |
| 23 |
+++ warsow-1.02-build.patch 27 Dec 2012 02:24:48 -0000 1.2 |
| 24 |
@@ -13,7 +13,21 @@ |
| 25 |
|
| 26 |
--- source/Makefile |
| 27 |
+++ source/Makefile |
| 28 |
-@@ -50,10 +50,10 @@ |
| 29 |
+@@ -30,6 +30,13 @@ |
| 30 |
+ # Build Warsow client without server capabilities? |
| 31 |
+ BUILD_THIN_CLIENT?=NO |
| 32 |
+ |
| 33 |
++# enable verbosity |
| 34 |
++V=NO |
| 35 |
++ |
| 36 |
++ifneq ($(V),YES) |
| 37 |
++Q=@ |
| 38 |
++endif |
| 39 |
++ |
| 40 |
+ ########################################################### |
| 41 |
+ |
| 42 |
+ ifeq ($(USE_MINGW),YES) |
| 43 |
+@@ -50,10 +57,10 @@ |
| 44 |
else |
| 45 |
CC?=gcc |
| 46 |
CXX?=g++ |
| 47 |
@@ -28,7 +42,7 @@ |
| 48 |
|
| 49 |
# this nice line comes from the linux kernel makefile |
| 50 |
BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/) |
| 51 |
-@@ -62,7 +62,7 @@ |
| 52 |
+@@ -62,7 +69,7 @@ |
| 53 |
ifeq ($(OS),FreeBSD) |
| 54 |
ARCH?=freebsd_$(BASE_ARCH) |
| 55 |
else |
| 56 |
@@ -37,7 +51,7 @@ |
| 57 |
endif |
| 58 |
|
| 59 |
SHARED_LIBRARY_EXTENSION=so |
| 60 |
-@@ -72,7 +72,7 @@ |
| 61 |
+@@ -72,7 +79,7 @@ |
| 62 |
|
| 63 |
ifeq ($(DEBUG_BUILD), YES) |
| 64 |
BINDIR=debug |
| 65 |
@@ -46,18 +60,20 @@ |
| 66 |
else |
| 67 |
BINDIR=release |
| 68 |
endif |
| 69 |
-@@ -196,8 +196,8 @@ |
| 70 |
+@@ -195,9 +202,9 @@ |
| 71 |
+ LOCALBASE?=/usr/local |
| 72 |
X11BASE?=/usr/X11R6 |
| 73 |
|
| 74 |
- CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden |
| 75 |
+-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden |
| 76 |
-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2 |
| 77 |
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG |
| 78 |
++CFLAGS_COMMON=-I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden |
| 79 |
+CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG |
| 80 |
+CFLAGS_DEBUG=-D_DEBUG |
| 81 |
ifeq ($(DEBUG_BUILD),YES) |
| 82 |
CFLAGS_COMMON+=$(CFLAGS_DEBUG) |
| 83 |
else |
| 84 |
-@@ -209,18 +209,18 @@ |
| 85 |
+@@ -209,18 +216,18 @@ |
| 86 |
CFLAGS_MODULE=-DPIC -fPIC |
| 87 |
CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED |
| 88 |
|
| 89 |
@@ -81,23 +97,30 @@ |
| 90 |
endif |
| 91 |
|
| 92 |
ifeq ($(ARCH),x86_64) |
| 93 |
-@@ -298,12 +298,9 @@ |
| 94 |
+@@ -298,12 +305,19 @@ |
| 95 |
###################################################################################################### |
| 96 |
# Helper functions |
| 97 |
###################################################################################################### |
| 98 |
--DO_CC=echo " > Compiling $<" && \ |
| 99 |
++ifneq ($(V),YES) |
| 100 |
+ DO_CC=echo " > Compiling $<" && \ |
| 101 |
- $(CC) $(CFLAGS_COMMON) -c $< -o $@ |
| 102 |
--DO_CXX=echo " > Compiling (c++) $<" && \ |
| 103 |
++ $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@ |
| 104 |
+ DO_CXX=echo " > Compiling (c++) $<" && \ |
| 105 |
- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ |
| 106 |
--DO_RES=echo " > Compiling resource $<" && \ |
| 107 |
++ $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@ |
| 108 |
+ DO_RES=echo " > Compiling resource $<" && \ |
| 109 |
- $(RES) $(RESFLAGS_COMMON) -i $< -o $@ |
| 110 |
-+DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@ |
| 111 |
-+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ |
| 112 |
++ $(RES) $(RESFLAGS_COMMON) -i $< -o $@ |
| 113 |
++else |
| 114 |
++DO_CC=$(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@ |
| 115 |
++DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@ |
| 116 |
+DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@ |
| 117 |
++endif |
| 118 |
++ |
| 119 |
|
| 120 |
DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT) |
| 121 |
DO_CC_DED=$(DO_CC) $(CFLAGS_DED) |
| 122 |
-@@ -505,17 +502,17 @@ |
| 123 |
+@@ -505,17 +519,17 @@ |
| 124 |
|
| 125 |
all: client openal qf ded cgame game ui irc cin angelwrap tv_server |
| 126 |
|
| 127 |
@@ -118,7 +141,7 @@ |
| 128 |
|
| 129 |
clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-librocket clean-irc clean-cin clean-angelwrap clean-tv_server |
| 130 |
|
| 131 |
-@@ -611,13 +608,14 @@ |
| 132 |
+@@ -611,13 +625,14 @@ |
| 133 |
@echo "> *********************************************************" |
| 134 |
compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB) |
| 135 |
link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION) |
| 136 |
@@ -134,7 +157,7 @@ |
| 137 |
@echo "> * Done building RocketCore library." |
| 138 |
@echo "> *********************************************************" |
| 139 |
@echo "> * Continuing ui building..." |
| 140 |
-@@ -656,7 +654,6 @@ |
| 141 |
+@@ -656,7 +671,6 @@ |
| 142 |
@echo "> *********************************************************" |
| 143 |
@echo "> * Building angelwrap" |
| 144 |
@echo "> *********************************************************" |
| 145 |
@@ -142,7 +165,7 @@ |
| 146 |
$(ANGELSCRIPT_INC)/angelscript.h: |
| 147 |
@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" |
| 148 |
@echo "!!!" |
| 149 |
-@@ -668,7 +665,7 @@ |
| 150 |
+@@ -668,7 +682,7 @@ |
| 151 |
|
| 152 |
$(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h |
| 153 |
@echo "> * Building Angelscript library first" |
| 154 |
@@ -151,13 +174,14 @@ |
| 155 |
@echo "> * Done building angelscript library." |
| 156 |
@echo "> *********************************************************" |
| 157 |
@echo "> * Continuing angelwrap building..." |
| 158 |
-@@ -702,69 +699,57 @@ |
| 159 |
+@@ -702,69 +716,69 @@ |
| 160 |
# DED |
| 161 |
######## |
| 162 |
$(BINDIR)/$(SERVER_EXE): $(OBJS_DED) |
| 163 |
- @echo " > Linking $@" && \ |
| 164 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) |
| 165 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) |
| 166 |
++ @echo " > Linking $@" |
| 167 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) |
| 168 |
|
| 169 |
######### |
| 170 |
# CLIENT |
| 171 |
@@ -166,12 +190,14 @@ |
| 172 |
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) |
| 173 |
- @echo " > Linking $@" && \ |
| 174 |
- $(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 175 |
-+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 176 |
++ @echo " > Linking $@" |
| 177 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 178 |
else |
| 179 |
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) |
| 180 |
- @echo " > Linking $@" && \ |
| 181 |
- $(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 182 |
-+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 183 |
++ @echo " > Linking $@" |
| 184 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 185 |
endif |
| 186 |
|
| 187 |
######### |
| 188 |
@@ -180,7 +206,8 @@ |
| 189 |
$(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL) |
| 190 |
- @echo " > Linking $@" && \ |
| 191 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) |
| 192 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) |
| 193 |
++ @echo " > Linking $@" |
| 194 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) |
| 195 |
|
| 196 |
######### |
| 197 |
# QF |
| 198 |
@@ -188,7 +215,8 @@ |
| 199 |
$(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF) |
| 200 |
- @echo " > Linking $@" && \ |
| 201 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) |
| 202 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) |
| 203 |
++ @echo " > Linking $@" |
| 204 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) |
| 205 |
|
| 206 |
######## |
| 207 |
# .SO |
| 208 |
@@ -196,32 +224,38 @@ |
| 209 |
$(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME) |
| 210 |
- @echo " > Linking $@" && \ |
| 211 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 212 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 213 |
++ @echo " > Linking $@" |
| 214 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 215 |
|
| 216 |
$(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME) |
| 217 |
- @echo " > Linking $@" && \ |
| 218 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 219 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 220 |
++ @echo " > Linking $@" |
| 221 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 222 |
|
| 223 |
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET) |
| 224 |
- @echo " > Linking $@" && \ |
| 225 |
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) |
| 226 |
-+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) |
| 227 |
++ @echo " > Linking $@" |
| 228 |
++ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) |
| 229 |
|
| 230 |
$(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC) |
| 231 |
- @echo " > Linking $@" && \ |
| 232 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) |
| 233 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) |
| 234 |
++ @echo " > Linking $@" |
| 235 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) |
| 236 |
|
| 237 |
$(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN) |
| 238 |
- @echo " > Linking $@" && \ |
| 239 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) |
| 240 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) |
| 241 |
++ @echo " > Linking $@" |
| 242 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) |
| 243 |
|
| 244 |
$(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP) |
| 245 |
- @echo " > Linking $@" && \ |
| 246 |
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) |
| 247 |
-+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) |
| 248 |
++ @echo " > Linking $@" |
| 249 |
++ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) |
| 250 |
|
| 251 |
######## |
| 252 |
# TV |
| 253 |
@@ -229,104 +263,107 @@ |
| 254 |
$(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER) |
| 255 |
- @echo " > Linking $@" && \ |
| 256 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) |
| 257 |
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) |
| 258 |
++ @echo " > Linking $@" |
| 259 |
++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) |
| 260 |
|
| 261 |
###################################################################################################### |
| 262 |
# Meta Rules |
| 263 |
-@@ -776,49 +761,48 @@ |
| 264 |
+@@ -776,229 +790,229 @@ |
| 265 |
# CLIENT |
| 266 |
######## |
| 267 |
$(BUILDDIR)/client/%.o: qcommon/%.c |
| 268 |
- @$(DO_CC_CLIENT) |
| 269 |
-+ $(DO_CC_CLIENT) |
| 270 |
++ $(Q)$(DO_CC_CLIENT) |
| 271 |
|
| 272 |
$(BUILDDIR)/client/%.o: server/%.c |
| 273 |
- @$(DO_CC_CLIENT) |
| 274 |
-+ $(DO_CC_CLIENT) |
| 275 |
++ $(Q)$(DO_CC_CLIENT) |
| 276 |
|
| 277 |
$(BUILDDIR)/client/%.o: client/%.c |
| 278 |
- @$(DO_CC_CLIENT) |
| 279 |
-+ $(DO_CC_CLIENT) |
| 280 |
++ $(Q)$(DO_CC_CLIENT) |
| 281 |
|
| 282 |
$(BUILDDIR)/client/%.o: ref_gl/%.c |
| 283 |
- @$(DO_CC_CLIENT) |
| 284 |
-+ $(DO_CC_CLIENT) |
| 285 |
++ $(Q)$(DO_CC_CLIENT) |
| 286 |
|
| 287 |
$(BUILDDIR)/client/%.o: null/%.c |
| 288 |
- @$(DO_CC_CLIENT) |
| 289 |
-+ $(DO_CC_CLIENT) |
| 290 |
++ $(Q)$(DO_CC_CLIENT) |
| 291 |
|
| 292 |
$(BUILDDIR)/client/%.o: matchmaker/%.c |
| 293 |
- @$(DO_CC_CLIENT) |
| 294 |
-+ $(DO_CC_CLIENT) |
| 295 |
++ $(Q)$(DO_CC_CLIENT) |
| 296 |
|
| 297 |
ifeq ($(USE_MINGW),YES) |
| 298 |
$(BUILDDIR)/client/%.o: win32/%.c |
| 299 |
- @$(DO_CC_CLIENT) |
| 300 |
-+ $(DO_CC_CLIENT) |
| 301 |
++ $(Q)$(DO_CC_CLIENT) |
| 302 |
|
| 303 |
$(BUILDDIR)/client/%.o: win32/%.rc |
| 304 |
- @$(DO_RES_CLIENT) |
| 305 |
-+ $(DO_RES_CLIENT) |
| 306 |
++ $(Q)$(DO_RES_CLIENT) |
| 307 |
else |
| 308 |
ifeq ($(OS),Darwin) |
| 309 |
$(BUILDDIR)/client/%.o: mac/%.c |
| 310 |
- @$(DO_CC_CLIENT) |
| 311 |
-+ $(DO_CC_CLIENT) |
| 312 |
++ $(Q)$(DO_CC_CLIENT) |
| 313 |
$(BUILDDIR)/client/%.o: unix/%.c |
| 314 |
- @$(DO_CC_CLIENT) |
| 315 |
-+ $(DO_CC_CLIENT) |
| 316 |
++ $(Q)$(DO_CC_CLIENT) |
| 317 |
else |
| 318 |
$(BUILDDIR)/client/%.o: unix/%.c |
| 319 |
- @$(DO_CC_CLIENT) |
| 320 |
-+ $(DO_CC_CLIENT) |
| 321 |
++ $(Q)$(DO_CC_CLIENT) |
| 322 |
endif |
| 323 |
endif |
| 324 |
|
| 325 |
$(BUILDDIR)/client/%.o: game/%.c |
| 326 |
- @$(DO_CC_CLIENT) |
| 327 |
-+ $(DO_CC_CLIENT) |
| 328 |
++ $(Q)$(DO_CC_CLIENT) |
| 329 |
|
| 330 |
$(BUILDDIR)/client/%.o: gameshared/%.c |
| 331 |
- @$(DO_CC_DED) |
| 332 |
-+ $(DO_CC_DED) |
| 333 |
++ $(Q)$(DO_CC_DED) |
| 334 |
|
| 335 |
$(BINDIR)/warsow: unix/start_script.sh |
| 336 |
- @echo " > Installing client start script" && \ |
| 337 |
- cp $< $@ && \ |
| 338 |
+- cp $< $@ && \ |
| 339 |
++ @echo " > Installing client start script" |
| 340 |
++ $(Q)cp $< $@ && \ |
| 341 |
chmod a+x $@ |
| 342 |
|
| 343 |
-@@ -826,60 +810,59 @@ |
| 344 |
+ ######## |
| 345 |
# OPENAL |
| 346 |
######## |
| 347 |
$(BUILDDIR)/openal/%.o: snd_openal/%.c |
| 348 |
- @$(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 349 |
-+ $(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 350 |
++ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 351 |
|
| 352 |
$(BUILDDIR)/openal/%.o: gameshared/%.c |
| 353 |
- @$(DO_CC_MODULE) |
| 354 |
-+ $(DO_CC_MODULE) |
| 355 |
++ $(Q)$(DO_CC_MODULE) |
| 356 |
|
| 357 |
######## |
| 358 |
# QF |
| 359 |
######## |
| 360 |
$(BUILDDIR)/qf/%.o: snd_qf/%.c |
| 361 |
- @$(DO_CC_MODULE) $(CFLAGS_QF) |
| 362 |
-+ $(DO_CC_MODULE) $(CFLAGS_QF) |
| 363 |
++ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF) |
| 364 |
|
| 365 |
ifeq ($(USE_MINGW),YES) |
| 366 |
$(BUILDDIR)/qf/win_snd.o: win32/win_snd.c |
| 367 |
- @$(DO_CC_MODULE) $(CFLAGS_DSOUND) |
| 368 |
-+ $(DO_CC_MODULE) $(CFLAGS_DSOUND) |
| 369 |
++ $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND) |
| 370 |
else |
| 371 |
$(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c |
| 372 |
- @$(DO_CC_MODULE) $(CFLAGS_SDL) |
| 373 |
-+ $(DO_CC_MODULE) $(CFLAGS_SDL) |
| 374 |
++ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL) |
| 375 |
endif |
| 376 |
|
| 377 |
$(BUILDDIR)/qf/%.o: gameshared/%.c |
| 378 |
- @$(DO_CC_MODULE) |
| 379 |
-+ $(DO_CC_MODULE) |
| 380 |
++ $(Q)$(DO_CC_MODULE) |
| 381 |
|
| 382 |
|
| 383 |
######## |
| 384 |
@@ -334,103 +371,105 @@ |
| 385 |
######## |
| 386 |
$(BUILDDIR)/ded/%.o: qcommon/%.c |
| 387 |
- @$(DO_CC_DED) |
| 388 |
-+ $(DO_CC_DED) |
| 389 |
++ $(Q)$(DO_CC_DED) |
| 390 |
|
| 391 |
$(BUILDDIR)/ded/%.o: server/%.c |
| 392 |
- @$(DO_CC_DED) |
| 393 |
-+ $(DO_CC_DED) |
| 394 |
++ $(Q)$(DO_CC_DED) |
| 395 |
|
| 396 |
ifeq ($(USE_MINGW),YES) |
| 397 |
$(BUILDDIR)/ded/%.o: win32/%.c |
| 398 |
- @$(DO_CC_DED) |
| 399 |
-+ $(DO_CC_DED) |
| 400 |
++ $(Q)$(DO_CC_DED) |
| 401 |
else |
| 402 |
$(BUILDDIR)/ded/%.o: unix/%.c |
| 403 |
- @$(DO_CC_DED) |
| 404 |
-+ $(DO_CC_DED) |
| 405 |
++ $(Q)$(DO_CC_DED) |
| 406 |
endif |
| 407 |
|
| 408 |
$(BUILDDIR)/ded/%.o: null/%.c |
| 409 |
- @$(DO_CC_DED) |
| 410 |
-+ $(DO_CC_DED) |
| 411 |
++ $(Q)$(DO_CC_DED) |
| 412 |
|
| 413 |
$(BUILDDIR)/ded/%.o: game/%.c |
| 414 |
- @$(DO_CC_DED) |
| 415 |
-+ $(DO_CC_DED) |
| 416 |
++ $(Q)$(DO_CC_DED) |
| 417 |
|
| 418 |
$(BUILDDIR)/ded/%.o: gameshared/%.c |
| 419 |
- @$(DO_CC_DED) |
| 420 |
-+ $(DO_CC_DED) |
| 421 |
++ $(Q)$(DO_CC_DED) |
| 422 |
|
| 423 |
$(BUILDDIR)/ded/%.o: matchmaker/%.c |
| 424 |
- @$(DO_CC_DED) |
| 425 |
-+ $(DO_CC_DED) |
| 426 |
++ $(Q)$(DO_CC_DED) |
| 427 |
|
| 428 |
$(BINDIR)/wsw_server: unix/start_script.sh |
| 429 |
- @echo " > Installing dedicated server start script" && \ |
| 430 |
- cp $< $@ && \ |
| 431 |
+- cp $< $@ && \ |
| 432 |
++ @echo " > Installing dedicated server start script" |
| 433 |
++ $(Q)cp $< $@ && \ |
| 434 |
chmod a+x $@ |
| 435 |
|
| 436 |
-@@ -887,117 +870,116 @@ |
| 437 |
+ ######## |
| 438 |
# CGAME |
| 439 |
######## |
| 440 |
$(BUILDDIR)/cgame/%.o: cgame/%.c |
| 441 |
- @$(DO_CC_MODULE) |
| 442 |
-+ $(DO_CC_MODULE) |
| 443 |
++ $(Q)$(DO_CC_MODULE) |
| 444 |
|
| 445 |
$(BUILDDIR)/cgame/%.o: gameshared/%.c |
| 446 |
- @$(DO_CC_MODULE) |
| 447 |
-+ $(DO_CC_MODULE) |
| 448 |
++ $(Q)$(DO_CC_MODULE) |
| 449 |
|
| 450 |
######## |
| 451 |
# GAME |
| 452 |
######## |
| 453 |
$(BUILDDIR)/game/%.o: game/%.c |
| 454 |
- @$(DO_CC_MODULE) |
| 455 |
-+ $(DO_CC_MODULE) |
| 456 |
++ $(Q)$(DO_CC_MODULE) |
| 457 |
|
| 458 |
$(BUILDDIR)/game/%.o: game/ai/%.c |
| 459 |
- @$(DO_CC_MODULE) |
| 460 |
-+ $(DO_CC_MODULE) |
| 461 |
++ $(Q)$(DO_CC_MODULE) |
| 462 |
|
| 463 |
$(BUILDDIR)/game/%.o: gameshared/%.c |
| 464 |
- @$(DO_CC_MODULE) |
| 465 |
-+ $(DO_CC_MODULE) |
| 466 |
++ $(Q)$(DO_CC_MODULE) |
| 467 |
|
| 468 |
$(BUILDDIR)/game/%.o: matchmaker/%.c |
| 469 |
- @$(DO_CC_MODULE) |
| 470 |
-+ $(DO_CC_MODULE) |
| 471 |
++ $(Q)$(DO_CC_MODULE) |
| 472 |
|
| 473 |
######## |
| 474 |
# UI.ROCKET |
| 475 |
######## |
| 476 |
$(BUILDDIR)/ui/%.o: gameshared/%.c |
| 477 |
- @$(DO_CC_MODULE) |
| 478 |
-+ $(DO_CC_MODULE) |
| 479 |
++ $(Q)$(DO_CC_MODULE) |
| 480 |
|
| 481 |
$(BUILDDIR)/ui/%.o: ui/%.cpp |
| 482 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 483 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 484 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 485 |
|
| 486 |
$(BUILDDIR)/ui/%.o: ui/kernel/%.cpp |
| 487 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 488 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 489 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 490 |
|
| 491 |
$(BUILDDIR)/ui/%.o: ui/as/%.cpp |
| 492 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 493 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 494 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 495 |
|
| 496 |
$(BUILDDIR)/ui/%.o: ui/datasources/%.cpp |
| 497 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 498 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 499 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 500 |
|
| 501 |
$(BUILDDIR)/ui/%.o: ui/widgets/%.cpp |
| 502 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 503 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 504 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 505 |
|
| 506 |
$(BUILDDIR)/ui/%.o: ui/decorators/%.cpp |
| 507 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 508 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 509 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 510 |
|
| 511 |
#$(BUILDDIR)/ui.as/%.o: matchmaker/%.c |
| 512 |
-# @$(DO_CC_MODULE) |
| 513 |
@@ -441,84 +480,87 @@ |
| 514 |
######## |
| 515 |
$(BUILDDIR)/irc/%.o: gameshared/%.c |
| 516 |
- @$(DO_CC_MODULE) |
| 517 |
-+ $(DO_CC_MODULE) |
| 518 |
++ $(Q)$(DO_CC_MODULE) |
| 519 |
|
| 520 |
$(BUILDDIR)/irc/%.o: irc/%.c |
| 521 |
- @$(DO_CC_MODULE) |
| 522 |
-+ $(DO_CC_MODULE) |
| 523 |
++ $(Q)$(DO_CC_MODULE) |
| 524 |
|
| 525 |
######## |
| 526 |
# CIN |
| 527 |
######## |
| 528 |
$(BUILDDIR)/cin/%.o: gameshared/%.c |
| 529 |
- @$(DO_CC_MODULE) |
| 530 |
-+ $(DO_CC_MODULE) |
| 531 |
++ $(Q)$(DO_CC_MODULE) |
| 532 |
|
| 533 |
$(BUILDDIR)/cin/%.o: cin/%.c |
| 534 |
- @$(DO_CC_MODULE) $(CFLAGS_CIN) |
| 535 |
-+ $(DO_CC_MODULE) $(CFLAGS_CIN) |
| 536 |
++ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN) |
| 537 |
|
| 538 |
######## |
| 539 |
# ANGELWRAP |
| 540 |
######## |
| 541 |
$(BUILDDIR)/angelwrap/%.o: gameshared/%.c |
| 542 |
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 543 |
-+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 544 |
++ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 545 |
|
| 546 |
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.c |
| 547 |
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 548 |
-+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 549 |
++ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 550 |
|
| 551 |
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp |
| 552 |
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 553 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 554 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 555 |
|
| 556 |
$(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp |
| 557 |
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 558 |
-+ $(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 559 |
++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 560 |
|
| 561 |
######## |
| 562 |
# TV SERVER |
| 563 |
######## |
| 564 |
$(BUILDDIR)/tv_server/%.o: qcommon/%.c |
| 565 |
- @$(DO_CC_TV_SERVER) |
| 566 |
-+ $(DO_CC_TV_SERVER) |
| 567 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 568 |
|
| 569 |
$(BUILDDIR)/tv_server/%.o: client/%.c |
| 570 |
- @$(DO_CC_TV_SERVER) |
| 571 |
-+ $(DO_CC_TV_SERVER) |
| 572 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 573 |
|
| 574 |
$(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c |
| 575 |
- @$(DO_CC_TV_SERVER) |
| 576 |
-+ $(DO_CC_TV_SERVER) |
| 577 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 578 |
|
| 579 |
$(BUILDDIR)/tv_server/%.o: tv_server/%.c |
| 580 |
- @$(DO_CC_TV_SERVER) |
| 581 |
-+ $(DO_CC_TV_SERVER) |
| 582 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 583 |
|
| 584 |
ifeq ($(USE_MINGW),YES) |
| 585 |
$(BUILDDIR)/tv_server/%.o: win32/%.c |
| 586 |
- @$(DO_CC_TV_SERVER) |
| 587 |
-+ $(DO_CC_TV_SERVER) |
| 588 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 589 |
else |
| 590 |
$(BUILDDIR)/tv_server/%.o: unix/%.c |
| 591 |
- @$(DO_CC_TV_SERVER) |
| 592 |
-+ $(DO_CC_TV_SERVER) |
| 593 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 594 |
endif |
| 595 |
|
| 596 |
$(BUILDDIR)/tv_server/%.o: null/%.c |
| 597 |
- @$(DO_CC_TV_SERVER) |
| 598 |
-+ $(DO_CC_TV_SERVER) |
| 599 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 600 |
|
| 601 |
$(BUILDDIR)/tv_server/%.o: gameshared/%.c |
| 602 |
- @$(DO_CC_TV_SERVER) |
| 603 |
-+ $(DO_CC_TV_SERVER) |
| 604 |
++ $(Q)$(DO_CC_TV_SERVER) |
| 605 |
|
| 606 |
$(BINDIR)/wswtv_server: unix/start_script.sh |
| 607 |
- @echo " > Installing TV server start script" && \ |
| 608 |
- cp $< $@ && \ |
| 609 |
+- cp $< $@ && \ |
| 610 |
++ @echo " > Installing TV server start script" |
| 611 |
++ $(Q)cp $< $@ && \ |
| 612 |
chmod a+x $@ |
| 613 |
|
| 614 |
+ ###################################################################################################### |
| 615 |
--- libsrcs/libRocket/libRocket/Makefile.warsow |
| 616 |
+++ libsrcs/libRocket/libRocket/Makefile.warsow |
| 617 |
@@ -13,9 +13,9 @@ |
Archives