diff options
| -rw-r--r-- | games-fps/warsow/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/warsow/files/warsow-1.02-build.patch | 224 | ||||
| -rw-r--r-- | games-fps/warsow/warsow-1.02.ebuild | 3 |
3 files changed, 141 insertions, 93 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index 55bc7015c189..77658703bbf1 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/warsow # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.46 2012/11/22 14:30:11 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.47 2012/12/27 02:24:48 hasufell Exp $ + + 27 Dec 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.02.ebuild, + files/warsow-1.02-build.patch: + respect CFLAGS in linking command, don't mix up CFLAGS and CXXFLAGS, improve + verbosity handling 22 Nov 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.0.ebuild, +files/warsow-1.0-pic.patch, warsow-1.02.ebuild, diff --git a/games-fps/warsow/files/warsow-1.02-build.patch b/games-fps/warsow/files/warsow-1.02-build.patch index 003c391f6721..ed73860fd4e9 100644 --- a/games-fps/warsow/files/warsow-1.02-build.patch +++ b/games-fps/warsow/files/warsow-1.02-build.patch @@ -13,7 +13,21 @@ g) address parallel make issues --- source/Makefile +++ source/Makefile -@@ -50,10 +50,10 @@ +@@ -30,6 +30,13 @@ + # Build Warsow client without server capabilities? + BUILD_THIN_CLIENT?=NO + ++# enable verbosity ++V=NO ++ ++ifneq ($(V),YES) ++Q=@ ++endif ++ + ########################################################### + + ifeq ($(USE_MINGW),YES) +@@ -50,10 +57,10 @@ else CC?=gcc CXX?=g++ @@ -28,7 +42,7 @@ g) address parallel make issues # this nice line comes from the linux kernel makefile 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/) -@@ -62,7 +62,7 @@ +@@ -62,7 +69,7 @@ ifeq ($(OS),FreeBSD) ARCH?=freebsd_$(BASE_ARCH) else @@ -37,7 +51,7 @@ g) address parallel make issues endif SHARED_LIBRARY_EXTENSION=so -@@ -72,7 +72,7 @@ +@@ -72,7 +79,7 @@ ifeq ($(DEBUG_BUILD), YES) BINDIR=debug @@ -46,18 +60,20 @@ g) address parallel make issues else BINDIR=release endif -@@ -196,8 +196,8 @@ +@@ -195,9 +202,9 @@ + LOCALBASE?=/usr/local X11BASE?=/usr/X11R6 - CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden +-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden -CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2 -CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG ++CFLAGS_COMMON=-I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden +CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG +CFLAGS_DEBUG=-D_DEBUG ifeq ($(DEBUG_BUILD),YES) CFLAGS_COMMON+=$(CFLAGS_DEBUG) else -@@ -209,18 +209,18 @@ +@@ -209,18 +216,18 @@ CFLAGS_MODULE=-DPIC -fPIC CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED @@ -81,23 +97,30 @@ g) address parallel make issues endif ifeq ($(ARCH),x86_64) -@@ -298,12 +298,9 @@ +@@ -298,12 +305,19 @@ ###################################################################################################### # Helper functions ###################################################################################################### --DO_CC=echo " > Compiling $<" && \ ++ifneq ($(V),YES) + DO_CC=echo " > Compiling $<" && \ - $(CC) $(CFLAGS_COMMON) -c $< -o $@ --DO_CXX=echo " > Compiling (c++) $<" && \ ++ $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@ + DO_CXX=echo " > Compiling (c++) $<" && \ - $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ --DO_RES=echo " > Compiling resource $<" && \ ++ $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@ + DO_RES=echo " > Compiling resource $<" && \ - $(RES) $(RESFLAGS_COMMON) -i $< -o $@ -+DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@ -+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ ++ $(RES) $(RESFLAGS_COMMON) -i $< -o $@ ++else ++DO_CC=$(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@ ++DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@ +DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@ ++endif ++ DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT) DO_CC_DED=$(DO_CC) $(CFLAGS_DED) -@@ -505,17 +502,17 @@ +@@ -505,17 +519,17 @@ all: client openal qf ded cgame game ui irc cin angelwrap tv_server @@ -118,7 +141,7 @@ g) address parallel make issues 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 -@@ -611,13 +608,14 @@ +@@ -611,13 +625,14 @@ @echo "> *********************************************************" compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB) link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION) @@ -134,7 +157,7 @@ g) address parallel make issues @echo "> * Done building RocketCore library." @echo "> *********************************************************" @echo "> * Continuing ui building..." -@@ -656,7 +654,6 @@ +@@ -656,7 +671,6 @@ @echo "> *********************************************************" @echo "> * Building angelwrap" @echo "> *********************************************************" @@ -142,7 +165,7 @@ g) address parallel make issues $(ANGELSCRIPT_INC)/angelscript.h: @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @echo "!!!" -@@ -668,7 +665,7 @@ +@@ -668,7 +682,7 @@ $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h @echo "> * Building Angelscript library first" @@ -151,13 +174,14 @@ g) address parallel make issues @echo "> * Done building angelscript library." @echo "> *********************************************************" @echo "> * Continuing angelwrap building..." -@@ -702,69 +699,57 @@ +@@ -702,69 +716,69 @@ # DED ######## $(BINDIR)/$(SERVER_EXE): $(OBJS_DED) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED) ######### # CLIENT @@ -166,12 +190,14 @@ g) address parallel make issues $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) - @echo " > Linking $@" && \ - $(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) -+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) else $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT) - @echo " > Linking $@" && \ - $(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) -+ $(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT) endif ######### @@ -180,7 +206,8 @@ g) address parallel make issues $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) ######### # QF @@ -188,7 +215,8 @@ g) address parallel make issues $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) ######## # .SO @@ -196,32 +224,38 @@ g) address parallel make issues $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET) - @echo " > Linking $@" && \ - $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) -+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) ++ @echo " > Linking $@" ++ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET) $(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC) $(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN) $(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP) - @echo " > Linking $@" && \ - $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) -+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) ++ @echo " > Linking $@" ++ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP) ######## # TV @@ -229,104 +263,107 @@ g) address parallel make issues $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER) - @echo " > Linking $@" && \ - $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) ++ @echo " > Linking $@" ++ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER) ###################################################################################################### # Meta Rules -@@ -776,49 +761,48 @@ +@@ -776,229 +790,229 @@ # CLIENT ######## $(BUILDDIR)/client/%.o: qcommon/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: server/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: client/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: ref_gl/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: null/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: matchmaker/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) ifeq ($(USE_MINGW),YES) $(BUILDDIR)/client/%.o: win32/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: win32/%.rc - @$(DO_RES_CLIENT) -+ $(DO_RES_CLIENT) ++ $(Q)$(DO_RES_CLIENT) else ifeq ($(OS),Darwin) $(BUILDDIR)/client/%.o: mac/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: unix/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) else $(BUILDDIR)/client/%.o: unix/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) endif endif $(BUILDDIR)/client/%.o: game/%.c - @$(DO_CC_CLIENT) -+ $(DO_CC_CLIENT) ++ $(Q)$(DO_CC_CLIENT) $(BUILDDIR)/client/%.o: gameshared/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) $(BINDIR)/warsow: unix/start_script.sh - @echo " > Installing client start script" && \ - cp $< $@ && \ +- cp $< $@ && \ ++ @echo " > Installing client start script" ++ $(Q)cp $< $@ && \ chmod a+x $@ -@@ -826,60 +810,59 @@ + ######## # OPENAL ######## $(BUILDDIR)/openal/%.o: snd_openal/%.c - @$(DO_CC_MODULE) $(CFLAGS_OPENAL) -+ $(DO_CC_MODULE) $(CFLAGS_OPENAL) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL) $(BUILDDIR)/openal/%.o: gameshared/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) ######## # QF ######## $(BUILDDIR)/qf/%.o: snd_qf/%.c - @$(DO_CC_MODULE) $(CFLAGS_QF) -+ $(DO_CC_MODULE) $(CFLAGS_QF) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF) ifeq ($(USE_MINGW),YES) $(BUILDDIR)/qf/win_snd.o: win32/win_snd.c - @$(DO_CC_MODULE) $(CFLAGS_DSOUND) -+ $(DO_CC_MODULE) $(CFLAGS_DSOUND) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND) else $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c - @$(DO_CC_MODULE) $(CFLAGS_SDL) -+ $(DO_CC_MODULE) $(CFLAGS_SDL) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL) endif $(BUILDDIR)/qf/%.o: gameshared/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) ######## @@ -334,103 +371,105 @@ g) address parallel make issues ######## $(BUILDDIR)/ded/%.o: qcommon/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) $(BUILDDIR)/ded/%.o: server/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) ifeq ($(USE_MINGW),YES) $(BUILDDIR)/ded/%.o: win32/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) else $(BUILDDIR)/ded/%.o: unix/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) endif $(BUILDDIR)/ded/%.o: null/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) $(BUILDDIR)/ded/%.o: game/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) $(BUILDDIR)/ded/%.o: gameshared/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) $(BUILDDIR)/ded/%.o: matchmaker/%.c - @$(DO_CC_DED) -+ $(DO_CC_DED) ++ $(Q)$(DO_CC_DED) $(BINDIR)/wsw_server: unix/start_script.sh - @echo " > Installing dedicated server start script" && \ - cp $< $@ && \ +- cp $< $@ && \ ++ @echo " > Installing dedicated server start script" ++ $(Q)cp $< $@ && \ chmod a+x $@ -@@ -887,117 +870,116 @@ + ######## # CGAME ######## $(BUILDDIR)/cgame/%.o: cgame/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) $(BUILDDIR)/cgame/%.o: gameshared/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) ######## # GAME ######## $(BUILDDIR)/game/%.o: game/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) $(BUILDDIR)/game/%.o: game/ai/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) $(BUILDDIR)/game/%.o: gameshared/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) $(BUILDDIR)/game/%.o: matchmaker/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) ######## # UI.ROCKET ######## $(BUILDDIR)/ui/%.o: gameshared/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) $(BUILDDIR)/ui/%.o: ui/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) -+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) -+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) $(BUILDDIR)/ui/%.o: ui/as/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) -+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) -+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) -+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ROCKET) -+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET) #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c -# @$(DO_CC_MODULE) @@ -441,84 +480,87 @@ g) address parallel make issues ######## $(BUILDDIR)/irc/%.o: gameshared/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) $(BUILDDIR)/irc/%.o: irc/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) ######## # CIN ######## $(BUILDDIR)/cin/%.o: gameshared/%.c - @$(DO_CC_MODULE) -+ $(DO_CC_MODULE) ++ $(Q)$(DO_CC_MODULE) $(BUILDDIR)/cin/%.o: cin/%.c - @$(DO_CC_MODULE) $(CFLAGS_CIN) -+ $(DO_CC_MODULE) $(CFLAGS_CIN) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN) ######## # ANGELWRAP ######## $(BUILDDIR)/angelwrap/%.o: gameshared/%.c - @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) -+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c - @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) -+ $(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP) $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) -+ $(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp - @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) -+ $(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) ++ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP) ######## # TV SERVER ######## $(BUILDDIR)/tv_server/%.o: qcommon/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) $(BUILDDIR)/tv_server/%.o: client/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) $(BUILDDIR)/tv_server/%.o: tv_server/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) ifeq ($(USE_MINGW),YES) $(BUILDDIR)/tv_server/%.o: win32/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) else $(BUILDDIR)/tv_server/%.o: unix/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) endif $(BUILDDIR)/tv_server/%.o: null/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) $(BUILDDIR)/tv_server/%.o: gameshared/%.c - @$(DO_CC_TV_SERVER) -+ $(DO_CC_TV_SERVER) ++ $(Q)$(DO_CC_TV_SERVER) $(BINDIR)/wswtv_server: unix/start_script.sh - @echo " > Installing TV server start script" && \ - cp $< $@ && \ +- cp $< $@ && \ ++ @echo " > Installing TV server start script" ++ $(Q)cp $< $@ && \ chmod a+x $@ + ###################################################################################################### --- libsrcs/libRocket/libRocket/Makefile.warsow +++ libsrcs/libRocket/libRocket/Makefile.warsow @@ -13,9 +13,9 @@ diff --git a/games-fps/warsow/warsow-1.02.ebuild b/games-fps/warsow/warsow-1.02.ebuild index b28038994a74..d9d787991fd1 100644 --- a/games-fps/warsow/warsow-1.02.ebuild +++ b/games-fps/warsow/warsow-1.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.2 2012/11/22 14:30:11 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.3 2012/12/27 02:24:48 hasufell Exp $ EAPI=4 inherit eutils check-reqs gnome2-utils games @@ -114,6 +114,7 @@ src_compile() { fi emake \ + V=YES \ BASE_ARCH=${arch} \ BINDIR=lib \ BUILD_ANGELWRAP=$(yesno angelscript) \ |