| 1 |
hasufell 14/06/20 20:20:39 |
| 2 |
|
| 3 |
Added: warsow-1.5.1-build.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-fps/warsow/files/warsow-1.5.1-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.5.1-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-1.5.1-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: warsow-1.5.1-build.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Thu Oct 11 15:00:18 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
a) respect flags/linker |
| 22 |
b) don't take ARCH from env (we set BASE_ARCH in the ebuild) |
| 23 |
c) split LDFLAGS and LDFLAGS_COMMON as per bug |
| 24 |
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650 |
| 25 |
d) don't remove angel-lib (compilation fails, why is this?) |
| 26 |
e) make output verbose |
| 27 |
f) remove start-scripts |
| 28 |
g) address parallel make issues |
| 29 |
|
| 30 |
--- source/Makefile |
| 31 |
+++ source/Makefile |
| 32 |
@@ -33,6 +33,17 @@ |
| 33 |
# Build Warsow client without server capabilities? |
| 34 |
BUILD_THIN_CLIENT?=NO |
| 35 |
|
| 36 |
+# use system libRocket |
| 37 |
+SYSTEM_LIBS=NO |
| 38 |
+ |
| 39 |
+# enable verbosity |
| 40 |
+V=NO |
| 41 |
+ |
| 42 |
+ifneq ($(V),YES) |
| 43 |
+Q=@ |
| 44 |
+endif |
| 45 |
+ |
| 46 |
+ |
| 47 |
########################################################### |
| 48 |
|
| 49 |
ifeq ($(USE_MINGW),YES) |
| 50 |
@@ -54,10 +65,10 @@ |
| 51 |
else |
| 52 |
CC?=gcc |
| 53 |
CXX?=g++ |
| 54 |
-LD=gcc |
| 55 |
-LXX=g++ |
| 56 |
-AR=ar |
| 57 |
-RANLIB=ranlib |
| 58 |
+LD=$(CC) |
| 59 |
+LXX=$(CXX) |
| 60 |
+AR?=ar |
| 61 |
+RANLIB?=ranlib |
| 62 |
|
| 63 |
# this nice line comes from the linux kernel makefile |
| 64 |
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/) |
| 65 |
@@ -66,7 +77,7 @@ |
| 66 |
ifeq ($(OS),FreeBSD) |
| 67 |
ARCH?=freebsd_$(BASE_ARCH) |
| 68 |
else |
| 69 |
-ARCH?=$(BASE_ARCH) |
| 70 |
+ARCH=$(BASE_ARCH) |
| 71 |
endif |
| 72 |
|
| 73 |
ifeq ($(ARCH),x86_64) |
| 74 |
@@ -83,7 +94,7 @@ |
| 75 |
|
| 76 |
ifeq ($(DEBUG_BUILD), YES) |
| 77 |
BINDIR=debug |
| 78 |
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG |
| 79 |
+CFLAGS_DEBUG=-D_DEBUG |
| 80 |
else |
| 81 |
BINDIR=release |
| 82 |
endif |
| 83 |
@@ -136,7 +147,11 @@ |
| 84 |
LIBROCKET_INC=$(LIBROCKET_DIR)/Include |
| 85 |
LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a |
| 86 |
|
| 87 |
+ifneq ($(SYSTEM_LIBS),YES) |
| 88 |
CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC) |
| 89 |
+else |
| 90 |
+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC) |
| 91 |
+endif |
| 92 |
# add the base of ui to inclusions |
| 93 |
CFLAGS_ROCKET+=-Iui |
| 94 |
|
| 95 |
@@ -231,9 +246,9 @@ |
| 96 |
####################### NORMAL *NIX? ###################### |
| 97 |
LOCALBASE?=/usr/local |
| 98 |
|
| 99 |
-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden -Winvalid-pch |
| 100 |
-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2 |
| 101 |
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG |
| 102 |
+CFLAGS_COMMON=-I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden |
| 103 |
+CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG |
| 104 |
+CFLAGS_DEBUG=-D_DEBUG |
| 105 |
ifeq ($(DEBUG_BUILD),YES) |
| 106 |
CFLAGS_COMMON+=$(CFLAGS_DEBUG) |
| 107 |
else |
| 108 |
@@ -245,18 +260,18 @@ |
| 109 |
CFLAGS_MODULE=-DPIC -fPIC |
| 110 |
CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED |
| 111 |
|
| 112 |
-LDFLAGS_COMMON=$(LDFLAGS) |
| 113 |
-LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++ |
| 114 |
+LDFLAGS_COMMON= |
| 115 |
+LXXFLAGS_COMMON=-lstdc++ -lsupc++ |
| 116 |
|
| 117 |
ifeq ($(OS),FreeBSD) |
| 118 |
LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm |
| 119 |
else |
| 120 |
-LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -ldl -O1 -Wl,--as-needed |
| 121 |
+LDFLAGS_COMMON+= -ldl -lm |
| 122 |
endif |
| 123 |
|
| 124 |
ifneq ($(DEBUG_BUILD),YES) |
| 125 |
-LDFLAGS_COMMON+= -s |
| 126 |
-LXXFLAGS_COMMON+= -s |
| 127 |
+LDFLAGS_COMMON+= |
| 128 |
+LXXFLAGS_COMMON+= |
| 129 |
endif |
| 130 |
|
| 131 |
ifeq ($(ARCH),x86_64) |
| 132 |
@@ -270,8 +285,12 @@ |
| 133 |
LDFLAGS_MODULE=-shared |
| 134 |
LDFLAGS_TV_SERVER=-lz -lpthread $(shell curl-config --libs) |
| 135 |
|
| 136 |
+ifneq ($(SYSTEM_LIBS),YES) |
| 137 |
# static link to custombuilt lib |
| 138 |
LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype |
| 139 |
+else |
| 140 |
+LDFLAGS_ROCKET = -lRocketCore -lRocketControls |
| 141 |
+endif |
| 142 |
|
| 143 |
# openal |
| 144 |
ifeq ($(BUILD_SND_OPENAL),YES) |
| 145 |
@@ -357,12 +376,18 @@ |
| 146 |
###################################################################################################### |
| 147 |
# Helper functions |
| 148 |
###################################################################################################### |
| 149 |
+ifneq ($(V),YES) |
| 150 |
DO_CC=echo " > Compiling $<" && \ |
| 151 |
$(CC) $(CFLAGS_COMMON) -c $< -o $@ |
| 152 |
DO_CXX=echo " > Compiling (c++) $<" && \ |
| 153 |
$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ |
| 154 |
DO_RES=echo " > Compiling resource $<" && \ |
| 155 |
$(RES) $(RESFLAGS_COMMON) -i $< -o $@ |
| 156 |
+else |
| 157 |
+DO_CC=$(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@ |
| 158 |
+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@ |
| 159 |
+DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@ |
| 160 |
+endif |
| 161 |
|
| 162 |
DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT) |
| 163 |
DO_CC_DED=$(DO_CC) $(CFLAGS_DED) |
| 164 |
@@ -627,10 +652,10 @@ |
| 165 |
|
| 166 |
all: client openal qf ded ui cgame game irc cin ftlib steamlib ref_gl angelwrap tv_server |
| 167 |
|
| 168 |
-client: $(BUILDDIRS) message-client compile-client link-client start-script-client |
| 169 |
+client: $(BUILDDIRS) message-client compile-client link-client |
| 170 |
openal: $(BUILDDIRS) message-openal compile-openal link-openal |
| 171 |
qf: $(BUILDDIRS) message-qf compile-qf link-qf |
| 172 |
-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded |
| 173 |
+ded: $(BUILDDIRS) message-ded compile-ded link-ded |
| 174 |
ui: $(BUILDDIRS) message-ui compile-ui link-ui |
| 175 |
cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame |
| 176 |
game: $(BUILDDIRS) message-game compile-game link-game |
| 177 |
@@ -640,7 +665,7 @@ |
| 178 |
steamlib: $(BUILDDIRS) message-steamlib compile-steamlib link-steamlib |
| 179 |
ref_gl: $(BUILDDIRS) message-ref_gl compile-ref_gl link-ref_gl |
| 180 |
angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap |
| 181 |
-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server |
| 182 |
+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server |
| 183 |
|
| 184 |
clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-ui clean-librocket clean-cgame clean-game clean-irc clean-cin clean-ftlib clean-steamlib clean-ref_gl clean-angelwrap clean-tv_server |
| 185 |
|
| 186 |
@@ -734,7 +759,12 @@ |
| 187 |
@echo "> *********************************************************" |
| 188 |
@echo "> * Building ui" |
| 189 |
@echo "> *********************************************************" |
| 190 |
+ifneq ($(SYSTEM_LIBS),YES) |
| 191 |
compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET) $(LIBROCKET_LIB) |
| 192 |
+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB) |
| 193 |
+else |
| 194 |
+compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET) |
| 195 |
+endif |
| 196 |
link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION) |
| 197 |
clean-ui: |
| 198 |
@echo " > Removing ui objects" && \ |
| 199 |
@@ -742,7 +772,7 @@ |
| 200 |
|
| 201 |
$(LIBROCKET_LIB): |
| 202 |
@echo "> * Building Rocket library" |
| 203 |
- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD) |
| 204 |
+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD) |
| 205 |
@echo "> * Done building RocketCore library." |
| 206 |
@echo "> *********************************************************" |
| 207 |
@echo "> * Continuing ui building..." |
| 208 |
@@ -828,7 +858,7 @@ |
| 209 |
|
| 210 |
$(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h |
| 211 |
@echo "> * Building Angelscript library first" |
| 212 |
- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR) |
| 213 |
+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR) |
| 214 |
@echo "> * Done building angelscript library." |
| 215 |
@echo "> *********************************************************" |
| 216 |
@echo "> * Continuing angelwrap building..." |
| 217 |
@@ -863,80 +893,86 @@ |
| 218 |
######## |
| 219 |
$(BINDIR)/$(SERVER_EXE): $(OBJS_DED) |
| 220 |
@echo " > Linking $@" && \ |
| 221 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) |
| 222 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) |
| 223 |
|
| 224 |
######### |
| 225 |
# CLIENT |
| 226 |
######### |
| 227 |
ifeq ($(OS),Darwin) |
| 228 |
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) |
| 229 |
- @echo " > Linking $@" && \ |
| 230 |
- $(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 231 |
+ @echo " > Linking $@" |
| 232 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 233 |
else |
| 234 |
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) |
| 235 |
- @echo " > Linking $@" && \ |
| 236 |
- $(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 237 |
+ @echo " > Linking $@" |
| 238 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 239 |
endif |
| 240 |
|
| 241 |
######### |
| 242 |
# OPENAL |
| 243 |
######### |
| 244 |
$(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL) |
| 245 |
- @echo " > Linking $@" && \ |
| 246 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) |
| 247 |
+ @echo " > Linking $@" |
| 248 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) |
| 249 |
|
| 250 |
######### |
| 251 |
# QF |
| 252 |
######### |
| 253 |
$(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF) |
| 254 |
- @echo " > Linking $@" && \ |
| 255 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) |
| 256 |
+ @echo " > Linking $@" |
| 257 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) |
| 258 |
|
| 259 |
######## |
| 260 |
# .SO |
| 261 |
######## |
| 262 |
$(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME) |
| 263 |
- @echo " > Linking $@" && \ |
| 264 |
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 265 |
+ @echo " > Linking $@" |
| 266 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 267 |
|
| 268 |
$(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME) |
| 269 |
- @echo " > Linking $@" && \ |
| 270 |
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 271 |
- |
| 272 |
+ @echo " > Linking $@" |
| 273 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) |
| 274 |
+ |
| 275 |
+ifneq ($(SYSTEM_LIBS),YES) |
| 276 |
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET) $(LIBROCKET_LIB) |
| 277 |
- @echo " > Linking $@" && \ |
| 278 |
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) |
| 279 |
+ @echo " > Linking $@" |
| 280 |
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) |
| 281 |
+else |
| 282 |
+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET) |
| 283 |
+ @echo " > Linking $@" |
| 284 |
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) |
| 285 |
+endif |
| 286 |
|
| 287 |
$(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC) |
| 288 |
- @echo " > Linking $@" && \ |
| 289 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) |
| 290 |
+ @echo " > Linking $@" |
| 291 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) |
| 292 |
|
| 293 |
$(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN) |
| 294 |
- @echo " > Linking $@" && \ |
| 295 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) |
| 296 |
+ @echo " > Linking $@" |
| 297 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) |
| 298 |
|
| 299 |
$(BINDIR)/libs/ftlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_FTLIB) |
| 300 |
- @echo " > Linking $@" && \ |
| 301 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB) |
| 302 |
+ @echo " > Linking $@" |
| 303 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB) |
| 304 |
|
| 305 |
$(BINDIR)/libs/steamlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_STEAMLIB) |
| 306 |
- @echo " > Linking $@" && \ |
| 307 |
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB) |
| 308 |
+ @echo " > Linking $@" |
| 309 |
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB) |
| 310 |
|
| 311 |
$(BINDIR)/libs/ref_gl_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_REF_GL) |
| 312 |
- @echo " > Linking $@" && \ |
| 313 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL) |
| 314 |
+ @echo " > Linking $@" |
| 315 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL) |
| 316 |
|
| 317 |
$(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP) $(ANGELSCRIPT_LIB) |
| 318 |
- @echo " > Linking $@" && \ |
| 319 |
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) |
| 320 |
+ @echo " > Linking $@" |
| 321 |
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) |
| 322 |
|
| 323 |
######## |
| 324 |
# TV |
| 325 |
######## |
| 326 |
$(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER) |
| 327 |
- @echo " > Linking $@" && \ |
| 328 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) |
| 329 |
+ @echo " > Linking $@" |
| 330 |
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) |
| 331 |
|
| 332 |
###################################################################################################### |
| 333 |
# Meta Rules |
| 334 |
@@ -948,181 +984,181 @@ |
| 335 |
# CLIENT |
| 336 |
######## |
| 337 |
$(BUILDDIR)/client/%.o: qcommon/%.c |
| 338 |
- @$(DO_CC_CLIENT) |
| 339 |
+ $(Q)$(DO_CC_CLIENT) |
| 340 |
|
| 341 |
$(BUILDDIR)/client/%.o: server/%.c |
| 342 |
- @$(DO_CC_CLIENT) |
| 343 |
+ $(Q)$(DO_CC_CLIENT) |
| 344 |
|
| 345 |
$(BUILDDIR)/client/%.o: client/%.c |
| 346 |
- @$(DO_CC_CLIENT) |
| 347 |
+ $(Q)$(DO_CC_CLIENT) |
| 348 |
|
| 349 |
$(BUILDDIR)/client/%.o: null/%.c |
| 350 |
- @$(DO_CC_CLIENT) |
| 351 |
+ $(Q)$(DO_CC_CLIENT) |
| 352 |
|
| 353 |
$(BUILDDIR)/client/%.o: matchmaker/%.c |
| 354 |
- @$(DO_CC_CLIENT) |
| 355 |
+ $(Q)$(DO_CC_CLIENT) |
| 356 |
|
| 357 |
ifeq ($(USE_MINGW),YES) |
| 358 |
$(BUILDDIR)/client/%.o: win32/%.c |
| 359 |
- @$(DO_CC_CLIENT) |
| 360 |
+ $(Q)$(DO_CC_CLIENT) |
| 361 |
|
| 362 |
$(BUILDDIR)/client/%.o: win32/%.rc |
| 363 |
- @$(DO_RES_CLIENT) |
| 364 |
+ $(Q)$(DO_RES_CLIENT) |
| 365 |
else |
| 366 |
ifeq ($(OS),Darwin) |
| 367 |
$(BUILDDIR)/client/%.o: mac/%.c |
| 368 |
- @$(DO_CC_CLIENT) |
| 369 |
+ $(Q)$(DO_CC_CLIENT) |
| 370 |
$(BUILDDIR)/client/%.o: unix/%.c |
| 371 |
- @$(DO_CC_CLIENT) |
| 372 |
+ $(Q)$(DO_CC_CLIENT) |
| 373 |
else |
| 374 |
$(BUILDDIR)/client/%.o: unix/%.c |
| 375 |
- @$(DO_CC_CLIENT) |
| 376 |
+ $(Q)$(DO_CC_CLIENT) |
| 377 |
endif |
| 378 |
endif |
| 379 |
|
| 380 |
$(BUILDDIR)/client/%.o: gameshared/%.c |
| 381 |
- @$(DO_CC_CLIENT) |
| 382 |
+ $(Q)$(DO_CC_CLIENT) |
| 383 |
$(BUILDDIR)/client/%.o: qalgo/%.c |
| 384 |
- @$(DO_CC_CLIENT) |
| 385 |
+ $(Q)$(DO_CC_CLIENT) |
| 386 |
|
| 387 |
$(BINDIR)/warsow: unix/start_script.sh |
| 388 |
- @echo " > Installing client start script" && \ |
| 389 |
- cp $< $@ && \ |
| 390 |
+ @echo " > Installing client start script" \ |
| 391 |
+ $(Q)cp $< $@ && \ |
| 392 |
chmod a+x $@ |
| 393 |
|
| 394 |
######## |
| 395 |
# OPENAL |
| 396 |
######## |
| 397 |
$(BUILDDIR)/openal/%.o: snd_openal/%.c |
| 398 |
- @$(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 399 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 400 |
$(BUILDDIR)/openal/%.o: snd_common/%.c |
| 401 |
- @$(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 402 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 403 |
|
| 404 |
$(BUILDDIR)/openal/%.o: gameshared/%.c |
| 405 |
- @$(DO_CC_MODULE) |
| 406 |
+ $(Q)$(DO_CC_MODULE) |
| 407 |
$(BUILDDIR)/openal/%.o: qalgo/%.c |
| 408 |
- @$(DO_CC_MODULE) |
| 409 |
+ $(Q)$(DO_CC_MODULE) |
| 410 |
|
| 411 |
######## |
| 412 |
# QF |
| 413 |
######## |
| 414 |
$(BUILDDIR)/qf/%.o: snd_qf/%.c |
| 415 |
- @$(DO_CC_MODULE) $(CFLAGS_QF) |
| 416 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF) |
| 417 |
$(BUILDDIR)/qf/%.o: snd_common/%.c |
| 418 |
- @$(DO_CC_MODULE) $(CFLAGS_QF) |
| 419 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF) |
| 420 |
|
| 421 |
ifeq ($(USE_MINGW),YES) |
| 422 |
$(BUILDDIR)/qf/win_snd.o: win32/win_snd.c |
| 423 |
- @$(DO_CC_MODULE) $(CFLAGS_DSOUND) |
| 424 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND) |
| 425 |
else |
| 426 |
$(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c |
| 427 |
- @$(DO_CC_MODULE) $(CFLAGS_QF) |
| 428 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF) |
| 429 |
endif |
| 430 |
|
| 431 |
$(BUILDDIR)/qf/%.o: gameshared/%.c |
| 432 |
- @$(DO_CC_MODULE) |
| 433 |
+ $(Q)$(DO_CC_MODULE) |
| 434 |
$(BUILDDIR)/qf/%.o: qalgo/%.c |
| 435 |
- @$(DO_CC_MODULE) |
| 436 |
+ $(Q)$(DO_CC_MODULE) |
| 437 |
|
| 438 |
######## |
| 439 |
# DED |
| 440 |
######## |
| 441 |
$(BUILDDIR)/ded/%.o: qcommon/%.c |
| 442 |
- @$(DO_CC_DED) |
| 443 |
+ $(Q)$(DO_CC_DED) |
| 444 |
|
| 445 |
$(BUILDDIR)/ded/%.o: server/%.c |
| 446 |
- @$(DO_CC_DED) |
| 447 |
+ $(Q)$(DO_CC_DED) |
| 448 |
|
| 449 |
ifeq ($(USE_MINGW),YES) |
| 450 |
$(BUILDDIR)/ded/%.o: win32/%.c |
| 451 |
- @$(DO_CC_DED) |
| 452 |
+ $(Q)$(DO_CC_DED) |
| 453 |
else |
| 454 |
$(BUILDDIR)/ded/%.o: unix/%.c |
| 455 |
- @$(DO_CC_DED) |
| 456 |
+ $(Q)$(DO_CC_DED) |
| 457 |
endif |
| 458 |
|
| 459 |
$(BUILDDIR)/ded/%.o: null/%.c |
| 460 |
- @$(DO_CC_DED) |
| 461 |
+ $(Q)$(DO_CC_DED) |
| 462 |
|
| 463 |
$(BUILDDIR)/ded/%.o: game/%.c |
| 464 |
- @$(DO_CC_DED) |
| 465 |
+ $(Q)$(DO_CC_DED) |
| 466 |
|
| 467 |
$(BUILDDIR)/ded/%.o: gameshared/%.c |
| 468 |
- @$(DO_CC_DED) |
| 469 |
+ $(Q)$(DO_CC_DED) |
| 470 |
|
| 471 |
$(BUILDDIR)/ded/%.o: qalgo/%.c |
| 472 |
- @$(DO_CC_DED) |
| 473 |
+ $(Q)$(DO_CC_DED) |
| 474 |
|
| 475 |
$(BUILDDIR)/ded/%.o: matchmaker/%.c |
| 476 |
- @$(DO_CC_DED) |
| 477 |
+ $(Q)$(DO_CC_DED) |
| 478 |
|
| 479 |
$(BINDIR)/wsw_server: unix/start_script.sh |
| 480 |
- @echo " > Installing dedicated server start script" && \ |
| 481 |
- cp $< $@ && \ |
| 482 |
+ @echo " > Installing dedicated server start script" \ |
| 483 |
+ $(Q)cp $< $@ && \ |
| 484 |
chmod a+x $@ |
| 485 |
|
| 486 |
######## |
| 487 |
# CGAME |
| 488 |
######## |
| 489 |
$(BUILDDIR)/cgame/%.o: cgame/%.cpp |
| 490 |
- @$(DO_CXX_MODULE) |
| 491 |
+ $(Q)$(DO_CXX_MODULE) |
| 492 |
|
| 493 |
$(BUILDDIR)/cgame/%.o: gameshared/%.c |
| 494 |
- @$(DO_CC_MODULE) |
| 495 |
+ $(Q)$(DO_CC_MODULE) |
| 496 |
|
| 497 |
$(BUILDDIR)/cgame/%.o: qalgo/%.c |
| 498 |
- @$(DO_CC_MODULE) |
| 499 |
+ $(Q)$(DO_CC_MODULE) |
| 500 |
|
| 501 |
######## |
| 502 |
# GAME |
| 503 |
######## |
| 504 |
$(BUILDDIR)/game/%.o: game/%.cpp |
| 505 |
- @$(DO_CXX_MODULE) $(CFLAGS_GAME) |
| 506 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME) |
| 507 |
|
| 508 |
$(BUILDDIR)/game/%.o: game/ai/%.cpp |
| 509 |
- @$(DO_CXX_MODULE) $(CFLAGS_GAME) |
| 510 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME) |
| 511 |
|
| 512 |
$(BUILDDIR)/game/%.o: gameshared/%.c |
| 513 |
- @$(DO_CC_MODULE) $(CFLAGS_GAME) |
| 514 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_GAME) |
| 515 |
|
| 516 |
$(BUILDDIR)/game/%.o: qalgo/%.c |
| 517 |
- @$(DO_CC_MODULE) |
| 518 |
+ $(Q)$(DO_CC_MODULE) |
| 519 |
|
| 520 |
$(BUILDDIR)/game/%.o: matchmaker/%.c |
| 521 |
- @$(DO_CC_MODULE) $(CFLAGS_GAME) |
| 522 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_GAME) |
| 523 |
|
| 524 |
######## |
| 525 |
# UI.ROCKET |
| 526 |
######## |
| 527 |
$(BUILDDIR)/ui/pch/ui_precompiled.h.gch: ui/ui_precompiled.h |
| 528 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 529 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 530 |
|
| 531 |
$(BUILDDIR)/ui/%.o: gameshared/%.c |
| 532 |
- @$(DO_CC_MODULE) |
| 533 |
+ $(Q)$(DO_CC_MODULE) |
| 534 |
|
| 535 |
$(BUILDDIR)/ui/%.o: qalgo/%.c |
| 536 |
- @$(DO_CC_MODULE) |
| 537 |
+ $(Q)$(DO_CC_MODULE) |
| 538 |
|
| 539 |
$(BUILDDIR)/ui/%.o: ui/%.cpp |
| 540 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 541 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 542 |
|
| 543 |
$(BUILDDIR)/ui/%.o: ui/kernel/%.cpp |
| 544 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 545 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 546 |
|
| 547 |
$(BUILDDIR)/ui/%.o: ui/as/%.cpp |
| 548 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 549 |
+ $(Q)@$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 550 |
|
| 551 |
$(BUILDDIR)/ui/%.o: ui/datasources/%.cpp |
| 552 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 553 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 554 |
|
| 555 |
$(BUILDDIR)/ui/%.o: ui/widgets/%.cpp |
| 556 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 557 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 558 |
|
| 559 |
$(BUILDDIR)/ui/%.o: ui/parsers/%.cpp |
| 560 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 561 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 562 |
|
| 563 |
$(BUILDDIR)/ui/%.o: ui/decorators/%.cpp |
| 564 |
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 565 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) |
| 566 |
|
| 567 |
#$(BUILDDIR)/ui.as/%.o: matchmaker/%.c |
| 568 |
# @$(DO_CC_MODULE) |
| 569 |
@@ -1131,66 +1167,66 @@ |
| 570 |
# IRC |
| 571 |
######## |
| 572 |
$(BUILDDIR)/irc/%.o: gameshared/%.c |
| 573 |
- @$(DO_CC_MODULE) |
| 574 |
+ $(Q)$(DO_CC_MODULE) |
| 575 |
|
| 576 |
$(BUILDDIR)/irc/%.o: qalgo/%.c |
| 577 |
- @$(DO_CC_MODULE) |
| 578 |
+ $(Q)$(DO_CC_MODULE) |
| 579 |
|
| 580 |
$(BUILDDIR)/irc/%.o: irc/%.c |
| 581 |
- @$(DO_CC_MODULE) |
| 582 |
+ $(Q)$(DO_CC_MODULE) |
| 583 |
|
| 584 |
######## |
| 585 |
# CIN |
| 586 |
######## |
| 587 |
$(BUILDDIR)/cin/%.o: gameshared/%.c |
| 588 |
- @$(DO_CC_MODULE) |
| 589 |
+ $(Q)$(DO_CC_MODULE) |
| 590 |
|
| 591 |
$(BUILDDIR)/cin/%.o: qalgo/%.c |
| 592 |
- @$(DO_CC_MODULE) |
| 593 |
+ $(Q)$(DO_CC_MODULE) |
| 594 |
|
| 595 |
$(BUILDDIR)/cin/%.o: cin/%.c |
| 596 |
- @$(DO_CC_MODULE) $(CFLAGS_CIN) |
| 597 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN) |
| 598 |
|
| 599 |
######## |
| 600 |
# FTLIB |
| 601 |
######## |
| 602 |
$(BUILDDIR)/ftlib/%.o: gameshared/%.c |
| 603 |
- @$(DO_CC_MODULE) |
| 604 |
+ $(Q)$(DO_CC_MODULE) |
| 605 |
|
| 606 |
$(BUILDDIR)/ftlib/%.o: qalgo/%.c |
| 607 |
- @$(DO_CC_MODULE) |
| 608 |
+ $(Q)$(DO_CC_MODULE) |
| 609 |
|
| 610 |
$(BUILDDIR)/ftlib/%.o: ftlib/%.c |
| 611 |
- @$(DO_CC_MODULE) $(CFLAGS_FTLIB) |
| 612 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_FTLIB) |
| 613 |
|
| 614 |
######## |
| 615 |
# STEAMLIB |
| 616 |
######## |
| 617 |
$(BUILDDIR)/steamlib/%.o: steamlib/%.cpp |
| 618 |
- @$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB) |
| 619 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB) |
| 620 |
|
| 621 |
######## |
| 622 |
# REF_GL |
| 623 |
######## |
| 624 |
$(BUILDDIR)/ref_gl/%.o: gameshared/%.c |
| 625 |
- @$(DO_CC_MODULE) |
| 626 |
+ $(Q)$(DO_CC_MODULE) |
| 627 |
|
| 628 |
$(BUILDDIR)/ref_gl/%.o: qalgo/%.c |
| 629 |
- @$(DO_CC_MODULE) |
| 630 |
+ $(Q)$(DO_CC_MODULE) |
| 631 |
|
| 632 |
$(BUILDDIR)/ref_gl/%.o: qcommon/%.c |
| 633 |
- @$(DO_CC_MODULE) |
| 634 |
+ $(Q)$(DO_CC_MODULE) |
| 635 |
|
| 636 |
$(BUILDDIR)/ref_gl/%.o: ref_gl/%.c |
| 637 |
- @$(DO_CC_MODULE) $(CFLAGS_REF_GL) |
| 638 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_REF_GL) |
| 639 |
|
| 640 |
ifeq ($(USE_MINGW),YES) |
| 641 |
$(BUILDDIR)/ref_gl/%.o: win32/%.c |
| 642 |
- @$(DO_CC_MODULE) |
| 643 |
+ $(Q)$(DO_CC_MODULE) |
| 644 |
else |
| 645 |
ifeq ($(OS),Darwin) |
| 646 |
$(BUILDDIR)/ref_gl/%.o: mac/%.c |
| 647 |
- @$(DO_CC_MODULE) |
| 648 |
+ $(Q)$(DO_CC_MODULE) |
| 649 |
else |
| 650 |
$(BUILDDIR)/ref_gl/%.o: unix/%.c |
| 651 |
@$(DO_CC_MODULE) |
| 652 |
@@ -1201,52 +1237,52 @@ |
| 653 |
# ANGELWRAP |
| 654 |
######## |
| 655 |
$(BUILDDIR)/angelwrap/%.o: gameshared/%.c |
| 656 |
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 657 |
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 658 |
|
| 659 |
$(BUILDDIR)/angelwrap/%.o: qalgo/%.c |
| 660 |
- @$(DO_CC_MODULE) |
| 661 |
+ $(Q)$(DO_CC_MODULE) |
| 662 |
|
| 663 |
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp |
| 664 |
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 665 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 666 |
|
| 667 |
$(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp |
| 668 |
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 669 |
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 670 |
|
| 671 |
######## |
| 672 |
# TV SERVER |
| 673 |
######## |
| 674 |
$(BUILDDIR)/tv_server/%.o: qcommon/%.c |
| 675 |
- @$(DO_CC_TV_SERVER) |
| 676 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 677 |
|
| 678 |
$(BUILDDIR)/tv_server/%.o: client/%.c |
| 679 |
- @$(DO_CC_TV_SERVER) |
| 680 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 681 |
|
| 682 |
$(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c |
| 683 |
- @$(DO_CC_TV_SERVER) |
| 684 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 685 |
|
| 686 |
$(BUILDDIR)/tv_server/%.o: tv_server/%.c |
| 687 |
- @$(DO_CC_TV_SERVER) |
| 688 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 689 |
|
| 690 |
ifeq ($(USE_MINGW),YES) |
| 691 |
$(BUILDDIR)/tv_server/%.o: win32/%.c |
| 692 |
- @$(DO_CC_TV_SERVER) |
| 693 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 694 |
else |
| 695 |
$(BUILDDIR)/tv_server/%.o: unix/%.c |
| 696 |
- @$(DO_CC_TV_SERVER) |
| 697 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 698 |
endif |
| 699 |
|
| 700 |
$(BUILDDIR)/tv_server/%.o: null/%.c |
| 701 |
- @$(DO_CC_TV_SERVER) |
| 702 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 703 |
|
| 704 |
$(BUILDDIR)/tv_server/%.o: gameshared/%.c |
| 705 |
- @$(DO_CC_TV_SERVER) |
| 706 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 707 |
|
| 708 |
$(BUILDDIR)/tv_server/%.o: qalgo/%.c |
| 709 |
- @$(DO_CC_TV_SERVER) |
| 710 |
+ $(Q)$(DO_CC_TV_SERVER) |
| 711 |
|
| 712 |
$(BINDIR)/wswtv_server: unix/start_script.sh |
| 713 |
- @echo " > Installing TV server start script" && \ |
| 714 |
- cp $< $@ && \ |
| 715 |
+ @echo " > Installing TV server start script" \ |
| 716 |
+ $(Q)cp $< $@ && \ |
| 717 |
chmod a+x $@ |
| 718 |
|
| 719 |
###################################################################################################### |
| 720 |
--- libsrcs/libRocket/libRocket/Build/Makefile.qfusion |
| 721 |
+++ libsrcs/libRocket/libRocket/Build/Makefile.qfusion |
| 722 |
@@ -15,9 +15,9 @@ |
| 723 |
endif |
| 724 |
|
| 725 |
ifeq ($(DEBUG_BUILD),YES) |
| 726 |
- CXXFLAGS += -g -DROCKET_DEBUG |
| 727 |
+ CXXFLAGS += -DROCKET_DEBUG |
| 728 |
else |
| 729 |
- CXXFLAGS += -O2 |
| 730 |
+ CXXFLAGS += |
| 731 |
endif |
| 732 |
|
| 733 |
BUILDDIR=obj |
Archives