| 1 |
hasufell 12/05/11 16:46:51 |
| 2 |
|
| 3 |
Added: warsow-0.62-build.patch |
| 4 |
Log: |
| 5 |
version bump wrt #349349 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha103/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-fps/warsow/files/warsow-0.62-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-0.62-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/warsow/files/warsow-0.62-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: warsow-0.62-build.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Fri May 11 11:57:40 UTC 2012 |
| 19 |
Subject: fix build system |
| 20 |
|
| 21 |
source/Makefile: |
| 22 |
a) respect flags/linker |
| 23 |
b) don't take ARCH from env (we set BASE_ARCH in the ebuild) |
| 24 |
c) split LDFLAGS and LDFLAGS_COMMON as per bug |
| 25 |
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650 |
| 26 |
d) don't remove angel-lib (compilation fails, why is this?) |
| 27 |
e) make output verbose |
| 28 |
f) remove start-scripts |
| 29 |
|
| 30 |
source/matchmaker/Makefile: |
| 31 |
respect flags/linker |
| 32 |
|
| 33 |
libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile: |
| 34 |
a) add -fno-strict-aliasing |
| 35 |
see https://bugs.gentoo.org/show_bug.cgi?id=285448 |
| 36 |
b) correct CXX |
| 37 |
|
| 38 |
--- source/Makefile |
| 39 |
+++ source/Makefile |
| 40 |
@@ -48,9 +48,9 @@ |
| 41 |
else |
| 42 |
CC?=gcc |
| 43 |
CXX?=g++ |
| 44 |
-LD=gcc |
| 45 |
-AR=ar |
| 46 |
-RANLIB=ranlib |
| 47 |
+LD=$(CC) |
| 48 |
+AR?=ar |
| 49 |
+RANLIB=?ranlib |
| 50 |
|
| 51 |
# this nice line comes from the linux kernel makefile |
| 52 |
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/) |
| 53 |
@@ -59,7 +59,7 @@ |
| 54 |
ifeq ($(OS),FreeBSD) |
| 55 |
ARCH?=freebsd_$(BASE_ARCH) |
| 56 |
else |
| 57 |
-ARCH?=$(BASE_ARCH) |
| 58 |
+ARCH=$(BASE_ARCH) |
| 59 |
endif |
| 60 |
|
| 61 |
SHARED_LIBRARY_EXTENSION=so |
| 62 |
@@ -69,7 +69,7 @@ |
| 63 |
|
| 64 |
ifeq ($(DEBUG_BUILD), YES) |
| 65 |
BINDIR=debug |
| 66 |
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG |
| 67 |
+CFLAGS_DEBUG=-D_DEBUG |
| 68 |
else |
| 69 |
BINDIR=release |
| 70 |
endif |
| 71 |
@@ -166,9 +166,9 @@ |
| 72 |
LOCALBASE?=/usr/local |
| 73 |
X11BASE?=/usr/X11R6 |
| 74 |
|
| 75 |
-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function |
| 76 |
-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG |
| 77 |
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG |
| 78 |
+CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function |
| 79 |
+CFLAGS_RELEASE=-fno-strict-aliasing -DNDEBUG |
| 80 |
+CFLAGS_DEBUG=-D_DEBUG |
| 81 |
ifeq ($(DEBUG_BUILD),YES) |
| 82 |
CFLAGS_COMMON+=$(CFLAGS_DEBUG) |
| 83 |
else |
| 84 |
@@ -180,14 +180,14 @@ |
| 85 |
CFLAGS_MODULE=-DPIC -fPIC |
| 86 |
CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED |
| 87 |
|
| 88 |
-LDFLAGS_COMMON=$(LDFLAGS) |
| 89 |
+LDFLAGS_COMMON= |
| 90 |
ifeq ($(OS),FreeBSD) |
| 91 |
LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread |
| 92 |
else |
| 93 |
-LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -Wl -O1 --as-needed |
| 94 |
+LDFLAGS_COMMON+= -ldl -lm |
| 95 |
endif |
| 96 |
ifneq ($(DEBUG_BUILD),YES) |
| 97 |
-LDFLAGS_COMMON+= -s |
| 98 |
+LDFLAGS_COMMON+= |
| 99 |
endif |
| 100 |
|
| 101 |
ifeq ($(ARCH),x86_64) |
| 102 |
@@ -203,7 +203,7 @@ |
| 103 |
|
| 104 |
# openal |
| 105 |
ifeq ($(BUILD_SND_OPENAL),YES) |
| 106 |
-OPENAL_CONFIG?=pkg-config openal |
| 107 |
+OPENAL_CONFIG?=$(shell pkg-config openal) |
| 108 |
|
| 109 |
CFLAGS_OPENAL=$(shell $(OPENAL_CONFIG) --cflags) |
| 110 |
LDFLAGS_OPENAL=-lvorbisfile |
| 111 |
@@ -252,12 +252,9 @@ |
| 112 |
###################################################################################################### |
| 113 |
# Helper functions |
| 114 |
###################################################################################################### |
| 115 |
-DO_CC=echo " > Compiling $<" && \ |
| 116 |
- $(CC) $(CFLAGS_COMMON) -c $< -o $@ |
| 117 |
-DO_CXX=echo " > Compiling (c++) $<" && \ |
| 118 |
- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ |
| 119 |
-DO_RES=echo " > Compiling resource $<" && \ |
| 120 |
- $(RES) $(RESFLAGS_COMMON) -i $< -o $@ |
| 121 |
+DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@ |
| 122 |
+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ |
| 123 |
+DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@ |
| 124 |
|
| 125 |
DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT) |
| 126 |
DO_CC_DED=$(DO_CC) $(CFLAGS_DED) |
| 127 |
@@ -477,16 +474,16 @@ |
| 128 |
|
| 129 |
all: client openal qf ded cgame game ui irc angelwrap tv_server |
| 130 |
|
| 131 |
-client: $(BUILDDIRS) message-client compile-client link-client start-script-client |
| 132 |
+client: $(BUILDDIRS) message-client compile-client link-client |
| 133 |
openal: $(BUILDDIRS) message-openal compile-openal link-openal |
| 134 |
qf: $(BUILDDIRS) message-qf compile-qf link-qf |
| 135 |
-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded |
| 136 |
+ded: $(BUILDDIRS) message-ded compile-ded link-ded |
| 137 |
cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame |
| 138 |
game: $(BUILDDIRS) message-game compile-game link-game |
| 139 |
ui: $(BUILDDIRS) message-ui compile-ui link-ui |
| 140 |
irc: $(BUILDDIRS) message-irc compile-irc link-irc |
| 141 |
angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap |
| 142 |
-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server |
| 143 |
+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server |
| 144 |
|
| 145 |
clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-irc clean-angelwrap clean-tv_server |
| 146 |
|
| 147 |
@@ -604,7 +601,6 @@ |
| 148 |
@echo "> *********************************************************" |
| 149 |
@echo "> * Building angelwrap" |
| 150 |
@echo "> *********************************************************" |
| 151 |
- -@rm $(ANGELSCRIPT_LIB) |
| 152 |
$(ANGELSCRIPT_INC)/angelscript.h: |
| 153 |
@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" |
| 154 |
@echo "!!!" |
| 155 |
@@ -650,64 +646,53 @@ |
| 156 |
# DED |
| 157 |
######## |
| 158 |
$(BINDIR)/$(SERVER_EXE): $(OBJS_DED) |
| 159 |
- @echo " > Linking $@" && \ |
| 160 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) |
| 161 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) |
| 162 |
|
| 163 |
######### |
| 164 |
# CLIENT |
| 165 |
######### |
| 166 |
ifeq ($(OS),Darwin) |
| 167 |
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) |
| 168 |
- @echo " > Linking $@" && \ |
| 169 |
- $(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 170 |
+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 171 |
else |
| 172 |
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) |
| 173 |
- @echo " > Linking $@" && \ |
| 174 |
- $(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 175 |
+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) |
| 176 |
endif |
| 177 |
|
| 178 |
######### |
| 179 |
# OPENAL |
| 180 |
######### |
| 181 |
$(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL) |
| 182 |
- @echo " > Linking $@" && \ |
| 183 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) $(DEF_SND_OPENAL) |
| 184 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) $(DEF_SND_OPENAL) |
| 185 |
|
| 186 |
######### |
| 187 |
# QF |
| 188 |
######### |
| 189 |
$(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF) |
| 190 |
- @echo " > Linking $@" && \ |
| 191 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) $(DEF_SND_QF) |
| 192 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) $(DEF_SND_QF) |
| 193 |
|
| 194 |
######## |
| 195 |
# .SO |
| 196 |
######## |
| 197 |
$(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME) |
| 198 |
- @echo " > Linking $@" && \ |
| 199 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_CGAME) |
| 200 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_CGAME) |
| 201 |
|
| 202 |
$(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME) |
| 203 |
- @echo " > Linking $@" && \ |
| 204 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_GAME) |
| 205 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_GAME) |
| 206 |
|
| 207 |
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI) |
| 208 |
- @echo " > Linking $@" && \ |
| 209 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_UI) |
| 210 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_UI) |
| 211 |
|
| 212 |
$(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC) |
| 213 |
- @echo " > Linking $@" && \ |
| 214 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_IRC) |
| 215 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_IRC) |
| 216 |
|
| 217 |
$(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP) |
| 218 |
- @echo " > Linking $@" && \ |
| 219 |
- $(CXX) -o $@ $^ $(LDFLAGS_ANGELWRAP) $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_ANGELWRAP) |
| 220 |
+ $(CXX) $(LDFLAGS) -o $@ $^ $(LDFLAGS_ANGELWRAP) $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_ANGELWRAP) |
| 221 |
######## |
| 222 |
# TV |
| 223 |
######## |
| 224 |
$(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER) |
| 225 |
- @echo " > Linking $@" && \ |
| 226 |
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) |
| 227 |
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) |
| 228 |
|
| 229 |
###################################################################################################### |
| 230 |
# Meta Rules |
| 231 |
@@ -719,49 +704,48 @@ |
| 232 |
# CLIENT |
| 233 |
######## |
| 234 |
$(BUILDDIR)/client/%.o: qcommon/%.c |
| 235 |
- @$(DO_CC_CLIENT) |
| 236 |
+ $(DO_CC_CLIENT) |
| 237 |
|
| 238 |
$(BUILDDIR)/client/%.o: server/%.c |
| 239 |
- @$(DO_CC_CLIENT) |
| 240 |
+ $(DO_CC_CLIENT) |
| 241 |
|
| 242 |
$(BUILDDIR)/client/%.o: client/%.c |
| 243 |
- @$(DO_CC_CLIENT) |
| 244 |
+ $(DO_CC_CLIENT) |
| 245 |
|
| 246 |
$(BUILDDIR)/client/%.o: ref_gl/%.c |
| 247 |
- @$(DO_CC_CLIENT) |
| 248 |
+ $(DO_CC_CLIENT) |
| 249 |
|
| 250 |
$(BUILDDIR)/client/%.o: null/%.c |
| 251 |
- @$(DO_CC_CLIENT) |
| 252 |
+ $(DO_CC_CLIENT) |
| 253 |
|
| 254 |
$(BUILDDIR)/client/%.o: matchmaker/%.c |
| 255 |
- @$(DO_CC_CLIENT) |
| 256 |
+ $(DO_CC_CLIENT) |
| 257 |
|
| 258 |
ifeq ($(USE_MINGW),YES) |
| 259 |
$(BUILDDIR)/client/%.o: win32/%.c |
| 260 |
- @$(DO_CC_CLIENT) |
| 261 |
+ $(DO_CC_CLIENT) |
| 262 |
|
| 263 |
$(BUILDDIR)/client/%.o: win32/%.rc |
| 264 |
- @$(DO_RES_CLIENT) |
| 265 |
+ $(DO_RES_CLIENT) |
| 266 |
else |
| 267 |
ifeq ($(OS),Darwin) |
| 268 |
$(BUILDDIR)/client/%.o: mac/%.c |
| 269 |
- @$(DO_CC_CLIENT) |
| 270 |
+ $(DO_CC_CLIENT) |
| 271 |
$(BUILDDIR)/client/%.o: unix/%.c |
| 272 |
- @$(DO_CC_CLIENT) |
| 273 |
+ $(DO_CC_CLIENT) |
| 274 |
else |
| 275 |
$(BUILDDIR)/client/%.o: unix/%.c |
| 276 |
- @$(DO_CC_CLIENT) |
| 277 |
+ $(DO_CC_CLIENT) |
| 278 |
endif |
| 279 |
endif |
| 280 |
|
| 281 |
$(BUILDDIR)/client/%.o: game/%.c |
| 282 |
- @$(DO_CC_CLIENT) |
| 283 |
+ $(DO_CC_CLIENT) |
| 284 |
|
| 285 |
$(BUILDDIR)/client/%.o: gameshared/%.c |
| 286 |
- @$(DO_CC_DED) |
| 287 |
+ $(DO_CC_DED) |
| 288 |
|
| 289 |
$(BINDIR)/warsow: unix/start_script.sh |
| 290 |
- @echo " > Installing client start script" && \ |
| 291 |
cp $< $@ && \ |
| 292 |
chmod a+x $@ |
| 293 |
|
| 294 |
@@ -769,60 +753,59 @@ |
| 295 |
# OPENAL |
| 296 |
######## |
| 297 |
$(BUILDDIR)/openal/%.o: snd_openal/%.c |
| 298 |
- @$(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 299 |
+ $(DO_CC_MODULE) $(CFLAGS_OPENAL) |
| 300 |
|
| 301 |
$(BUILDDIR)/openal/%.o: gameshared/%.c |
| 302 |
- @$(DO_CC_MODULE) |
| 303 |
+ $(DO_CC_MODULE) |
| 304 |
|
| 305 |
######## |
| 306 |
# QF |
| 307 |
######## |
| 308 |
$(BUILDDIR)/qf/%.o: snd_qf/%.c |
| 309 |
- @$(DO_CC_MODULE) $(CFLAGS_QF) |
| 310 |
+ $(DO_CC_MODULE) $(CFLAGS_QF) |
| 311 |
|
| 312 |
ifeq ($(USE_MINGW),YES) |
| 313 |
$(BUILDDIR)/qf/win_snd.o: win32/win_snd.c |
| 314 |
- @$(DO_CC_MODULE) $(CFLAGS_DSOUND) |
| 315 |
+ $(DO_CC_MODULE) $(CFLAGS_DSOUND) |
| 316 |
else |
| 317 |
$(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c |
| 318 |
- @$(DO_CC_MODULE) $(CFLAGS_SDL) |
| 319 |
+ $(DO_CC_MODULE) $(CFLAGS_SDL) |
| 320 |
endif |
| 321 |
|
| 322 |
$(BUILDDIR)/qf/%.o: gameshared/%.c |
| 323 |
- @$(DO_CC_MODULE) |
| 324 |
+ $(DO_CC_MODULE) |
| 325 |
|
| 326 |
|
| 327 |
######## |
| 328 |
# DED |
| 329 |
######## |
| 330 |
$(BUILDDIR)/ded/%.o: qcommon/%.c |
| 331 |
- @$(DO_CC_DED) |
| 332 |
+ $(DO_CC_DED) |
| 333 |
|
| 334 |
$(BUILDDIR)/ded/%.o: server/%.c |
| 335 |
- @$(DO_CC_DED) |
| 336 |
+ $(DO_CC_DED) |
| 337 |
|
| 338 |
ifeq ($(USE_MINGW),YES) |
| 339 |
$(BUILDDIR)/ded/%.o: win32/%.c |
| 340 |
- @$(DO_CC_DED) |
| 341 |
+ $(DO_CC_DED) |
| 342 |
else |
| 343 |
$(BUILDDIR)/ded/%.o: unix/%.c |
| 344 |
- @$(DO_CC_DED) |
| 345 |
+ $(DO_CC_DED) |
| 346 |
endif |
| 347 |
|
| 348 |
$(BUILDDIR)/ded/%.o: null/%.c |
| 349 |
- @$(DO_CC_DED) |
| 350 |
+ $(DO_CC_DED) |
| 351 |
|
| 352 |
$(BUILDDIR)/ded/%.o: game/%.c |
| 353 |
- @$(DO_CC_DED) |
| 354 |
+ $(DO_CC_DED) |
| 355 |
|
| 356 |
$(BUILDDIR)/ded/%.o: gameshared/%.c |
| 357 |
- @$(DO_CC_DED) |
| 358 |
+ $(DO_CC_DED) |
| 359 |
|
| 360 |
$(BUILDDIR)/ded/%.o: matchmaker/%.c |
| 361 |
- @$(DO_CC_DED) |
| 362 |
+ $(DO_CC_DED) |
| 363 |
|
| 364 |
$(BINDIR)/wsw_server: unix/start_script.sh |
| 365 |
- @echo " > Installing dedicated server start script" && \ |
| 366 |
cp $< $@ && \ |
| 367 |
chmod a+x $@ |
| 368 |
|
| 369 |
@@ -830,91 +813,90 @@ |
| 370 |
# CGAME |
| 371 |
######## |
| 372 |
$(BUILDDIR)/cgame/%.o: cgame/%.c |
| 373 |
- @$(DO_CC_MODULE) |
| 374 |
+ $(DO_CC_MODULE) |
| 375 |
|
| 376 |
$(BUILDDIR)/cgame/%.o: gameshared/%.c |
| 377 |
- @$(DO_CC_MODULE) |
| 378 |
+ $(DO_CC_MODULE) |
| 379 |
|
| 380 |
######## |
| 381 |
# GAME |
| 382 |
######## |
| 383 |
$(BUILDDIR)/game/%.o: game/%.c |
| 384 |
- @$(DO_CC_MODULE) |
| 385 |
+ $(DO_CC_MODULE) |
| 386 |
|
| 387 |
$(BUILDDIR)/game/%.o: game/ai/%.c |
| 388 |
- @$(DO_CC_MODULE) |
| 389 |
+ $(DO_CC_MODULE) |
| 390 |
|
| 391 |
$(BUILDDIR)/game/%.o: gameshared/%.c |
| 392 |
- @$(DO_CC_MODULE) |
| 393 |
+ $(DO_CC_MODULE) |
| 394 |
|
| 395 |
######## |
| 396 |
# UI |
| 397 |
######## |
| 398 |
$(BUILDDIR)/ui/%.o: gameshared/%.c |
| 399 |
- @$(DO_CC_MODULE) |
| 400 |
+ $(DO_CC_MODULE) |
| 401 |
|
| 402 |
$(BUILDDIR)/ui/%.o: ui.old/%.c |
| 403 |
- @$(DO_CC_MODULE) |
| 404 |
+ $(DO_CC_MODULE) |
| 405 |
|
| 406 |
$(BUILDDIR)/ui/%.o: ui.old/%.cpp |
| 407 |
- @$(DO_CXX_MODULE) |
| 408 |
+ $(DO_CXX_MODULE) |
| 409 |
|
| 410 |
$(BUILDDIR)/ui/%.o: matchmaker/%.c |
| 411 |
- @$(DO_CC_MODULE) |
| 412 |
+ $(DO_CC_MODULE) |
| 413 |
|
| 414 |
######## |
| 415 |
# IRC |
| 416 |
######## |
| 417 |
$(BUILDDIR)/irc/%.o: gameshared/%.c |
| 418 |
- @$(DO_CC_MODULE) |
| 419 |
+ $(DO_CC_MODULE) |
| 420 |
|
| 421 |
$(BUILDDIR)/irc/%.o: irc/%.c |
| 422 |
- @$(DO_CC_MODULE) |
| 423 |
+ $(DO_CC_MODULE) |
| 424 |
|
| 425 |
######## |
| 426 |
# ANGELWRAP |
| 427 |
######## |
| 428 |
$(BUILDDIR)/angelwrap/%.o: gameshared/%.c |
| 429 |
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 430 |
+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 431 |
|
| 432 |
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.c |
| 433 |
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 434 |
+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) |
| 435 |
|
| 436 |
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp |
| 437 |
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 438 |
+ $(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) |
| 439 |
|
| 440 |
|
| 441 |
######## |
| 442 |
# TV SERVER |
| 443 |
######## |
| 444 |
$(BUILDDIR)/tv_server/%.o: qcommon/%.c |
| 445 |
- @$(DO_CC_TV_SERVER) |
| 446 |
+ $(DO_CC_TV_SERVER) |
| 447 |
|
| 448 |
$(BUILDDIR)/tv_server/%.o: client/%.c |
| 449 |
- @$(DO_CC_TV_SERVER) |
| 450 |
+ $(DO_CC_TV_SERVER) |
| 451 |
|
| 452 |
$(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c |
| 453 |
- @$(DO_CC_TV_SERVER) |
| 454 |
+ $(DO_CC_TV_SERVER) |
| 455 |
|
| 456 |
$(BUILDDIR)/tv_server/%.o: tv_server/%.c |
| 457 |
- @$(DO_CC_TV_SERVER) |
| 458 |
+ $(DO_CC_TV_SERVER) |
| 459 |
|
| 460 |
ifeq ($(USE_MINGW),YES) |
| 461 |
$(BUILDDIR)/tv_server/%.o: win32/%.c |
| 462 |
- @$(DO_CC_TV_SERVER) |
| 463 |
+ $(DO_CC_TV_SERVER) |
| 464 |
else |
| 465 |
$(BUILDDIR)/tv_server/%.o: unix/%.c |
| 466 |
- @$(DO_CC_TV_SERVER) |
| 467 |
+ $(DO_CC_TV_SERVER) |
| 468 |
endif |
| 469 |
|
| 470 |
$(BUILDDIR)/tv_server/%.o: null/%.c |
| 471 |
- @$(DO_CC_TV_SERVER) |
| 472 |
+ $(DO_CC_TV_SERVER) |
| 473 |
|
| 474 |
$(BUILDDIR)/tv_server/%.o: gameshared/%.c |
| 475 |
- @$(DO_CC_TV_SERVER) |
| 476 |
+ $(DO_CC_TV_SERVER) |
| 477 |
|
| 478 |
$(BINDIR)/wswtv_server: unix/start_script.sh |
| 479 |
- @echo " > Installing TV server start script" && \ |
| 480 |
cp $< $@ && \ |
| 481 |
chmod a+x $@ |
| 482 |
|
| 483 |
--- source/matchmaker/Makefile |
| 484 |
+++ source/matchmaker/Makefile |
| 485 |
@@ -9,7 +9,7 @@ |
| 486 |
DEBUG_BUILD?=YES |
| 487 |
|
| 488 |
CC?=gcc |
| 489 |
-LD=gcc |
| 490 |
+LD=$(CC) |
| 491 |
RM?=rm |
| 492 |
|
| 493 |
BUILDDIR=build$(ARCH) |
| 494 |
@@ -26,9 +26,9 @@ |
| 495 |
CFLAGS_MM=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall |
| 496 |
|
| 497 |
ifeq ($(DEBUG_BUILD),YES) |
| 498 |
-CFLAGS_MM += -O0 -ggdb -D_DEBUG |
| 499 |
+CFLAGS_MM += -D_DEBUG |
| 500 |
else |
| 501 |
-CFLAGS_MM += -O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG |
| 502 |
+CFLAGS_MM += -fno-strict-aliasing -DNDEBUG |
| 503 |
endif |
| 504 |
|
| 505 |
CFLAGS_MM+=-DDEDICATED_ONLY -DMATCHMAKER -DC_ONLY |
| 506 |
--- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile |
| 507 |
+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile |
| 508 |
@@ -12,10 +12,10 @@ |
| 509 |
INCDIR = ../../include |
| 510 |
OBJDIR = obj |
| 511 |
|
| 512 |
-CXX ?= gcc |
| 513 |
+CXX ?= g++ |
| 514 |
AR ?= ar |
| 515 |
RANLIB ?= ranlib |
| 516 |
-CXXFLAGS_AS = $(CXXFLAGS) -g -Wall -fPIC |
| 517 |
+CXXFLAGS_AS = $(CXXFLAGS) -Wall -fPIC -fno-strict-aliasing |
| 518 |
DELETER = rm -f |
| 519 |
COPIER = cp |
Archives