summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2014-06-30 05:59:15 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2014-06-30 05:59:15 +0000
commitd411d7c5b088500593f734ad488b6f7ec066a0bb (patch)
tree7a7d235f095ffe1eec1608452dd27e369a168847 /games-fps
parentAdds wxGTK3.0 version dependency, bug #515688 (diff)
downloadgentoo-2-d411d7c5b088500593f734ad488b6f7ec066a0bb.tar.gz
gentoo-2-d411d7c5b088500593f734ad488b6f7ec066a0bb.tar.bz2
gentoo-2-d411d7c5b088500593f734ad488b6f7ec066a0bb.zip
old
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/warsow/ChangeLog11
-rw-r--r--games-fps/warsow/files/01-warsow-1.03-clang.patch27
-rw-r--r--games-fps/warsow/files/02-warsow-1.03-clang.patch67
-rw-r--r--games-fps/warsow/files/03-warsow-1.03-clang.patch39
-rw-r--r--games-fps/warsow/files/warsow-1.02-build.patch624
-rw-r--r--games-fps/warsow/files/warsow-1.02-pic.patch11
-rw-r--r--games-fps/warsow/files/warsow-1.03-build.patch624
-rw-r--r--games-fps/warsow/files/warsow-1.5-build.patch715
-rw-r--r--games-fps/warsow/warsow-1.02-r1.ebuild180
-rw-r--r--games-fps/warsow/warsow-1.03.ebuild197
-rw-r--r--games-fps/warsow/warsow-1.5.ebuild178
11 files changed, 10 insertions, 2663 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 042b7d60e548..b32ad1b2d8ed 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for games-fps/warsow
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.59 2014/06/22 16:28:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.60 2014/06/30 05:59:15 mr_bones_ Exp $
+
+ 30 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org>
+ -files/01-warsow-1.03-clang.patch, -files/02-warsow-1.03-clang.patch,
+ -files/03-warsow-1.03-clang.patch, -files/warsow-1.02-build.patch,
+ -files/warsow-1.02-pic.patch, -files/warsow-1.03-build.patch,
+ -files/warsow-1.5-build.patch, -warsow-1.02-r1.ebuild, -warsow-1.03.ebuild,
+ -warsow-1.5.ebuild, files/warsow-1.0-build.patch, files/warsow-1.0-pic.patch,
+ files/warsow-1.03-pic.patch, files/warsow-1.5.1-build.patch:
+ old
22 Jun 2014; Julian Ospald <hasufell@gentoo.org> warsow-1.5.1.ebuild:
fix SRC_URI wrt #514466
diff --git a/games-fps/warsow/files/01-warsow-1.03-clang.patch b/games-fps/warsow/files/01-warsow-1.03-clang.patch
deleted file mode 100644
index ee8c4be46c32..000000000000
--- a/games-fps/warsow/files/01-warsow-1.03-clang.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Nov 9 11:55:42 UTC 2013
-Subject: fix clang build
-
-based on
-https://github.com/viciious/qfusion/commit/b926e692a00dcdeb25a1075c196d6bbefed34172
-
---- a/source/unix/unix_glw.c
-+++ b/source/unix/unix_glw.c
-@@ -31,17 +31,7 @@ Foundation, Inc., 59 Temple Place - Suit
- **
- */
-
--#include <termios.h>
--#include <sys/ioctl.h>
--#include <sys/stat.h>
--#include <stdarg.h>
--#include <stdio.h>
--#include <unistd.h>
--#include <signal.h>
--#include <dlfcn.h>
--
- #include "../ref_gl/r_local.h"
--#include "../client/keys.h"
-
- #include "x11.h"
-
diff --git a/games-fps/warsow/files/02-warsow-1.03-clang.patch b/games-fps/warsow/files/02-warsow-1.03-clang.patch
deleted file mode 100644
index c660efd411cb..000000000000
--- a/games-fps/warsow/files/02-warsow-1.03-clang.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c63672c41ae5332a5d123e3d59abf38417fab961 Mon Sep 17 00:00:00 2001
-From: Victor Luchits <vluchits@gmail.com>
-Date: Sat, 12 Oct 2013 15:04:53 +0400
-Subject: [PATCH] This should fix compilation in clang
-
-ctassert<false> was evaluated in template function (probably due to two-phase name lookup?). Change it to ctassert<sizeof(typename)==0) so evaluation is delayed until actual template function instantiation.
----
- source/ui/as/asbind.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/source/ui/as/asbind.h b/source/ui/as/asbind.h
-index 9906859..f78ef42 100644
---- a/source/ui/as/asbind.h
-+++ b/source/ui/as/asbind.h
-@@ -268,7 +268,7 @@ struct ctassert {
- }
-
- // throw ?
-- template<typename T> const char * typestr() { ctassert<false>(); return "ERROR"; }
-+ template<typename T> const char * typestr() { ctassert<sizeof(T)==0>(); return "ERROR"; }
-
- template<> inline const char *typestr<signed int>() { return "int"; }
- template<> inline const char *typestr<unsigned int>() { return "uint"; }
-@@ -439,7 +439,7 @@ struct __ptr<T*> {
- struct FunctionStringProxy {
- std::string operator()( const char *s )
- {
-- ctassert<false>();
-+ ctassert<sizeof(R)==0>();
- throw Exception( std::string("FunctionStringProxy base called with " ) + s );
- }
- };
-@@ -542,7 +542,7 @@ struct FunctionStringProxy<R (*)(A1,A2,A3,A4,A5,A6)> {
- template<typename T> struct MethodStringProxy {
- std::string operator()( const char *s )
- {
-- ctassert<false>();
-+ ctassert<sizeof(T)==0>();
- throw Exception( std::string( "MethodStringProxy: base class called in " ) + s );
- }
- };
-@@ -904,12 +904,12 @@ struct StripThisProxy<R(*)(A1,A2,A3,A4,A5,A6,A7)> {
- // first define structs to get/set arguments (struct to partial-specialize)
- template<typename T> struct SetArg {
- void operator()( asIScriptContext *ctx, int idx, T &t ) {
-- ctassert<false>();
-+ ctassert<sizeof(T)==0>();
- }
- };
- template<typename T> struct GetArg {
- T operator()() {
-- ctassert<false>();
-+ ctassert<sizeof(T)==0>();
- return T();
- }
- };
-@@ -1046,7 +1046,7 @@ struct FunctionPtr : FunctionPtrBase {
- FunctionPtr( asIScriptFunction *fptr=NULL ) : FunctionPtrBase( fptr ) {}
- R operator()( void )
- {
-- ctassert<false>();
-+ ctassert<sizeof(R)==0>();
- throw std::runtime_error( "FunctionPtr baseclass called!" );
- return R();
- }
---
-1.8.4
diff --git a/games-fps/warsow/files/03-warsow-1.03-clang.patch b/games-fps/warsow/files/03-warsow-1.03-clang.patch
deleted file mode 100644
index 507de2483df9..000000000000
--- a/games-fps/warsow/files/03-warsow-1.03-clang.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Nov 9 12:01:14 UTC 2013
-Subject: fix clang warnings
-
-based on
-https://github.com/viciious/qfusion/commit/792e50cc9b55e0c5e4c954a1c0c4e4a61ad54e2c.patch
-
---- a/source/cgame/cg_draw.c
-+++ b/source/cgame/cg_draw.c
-@@ -309,7 +309,7 @@ void CG_DrawMiniMap( int x, int y, int i
- coords[2] = ( coords[2] + (float)z_lefttop ) / (float)map_z;
-
- // is it a player?
-- if( ( cent->current.type == ET_PLAYER ) )
-+ if( cent->current.type == ET_PLAYER )
- {
- int box_size = (int)( 3.0 + coords[2] * 10.0 );
-
---- a/source/cgame/cg_ents.c
-+++ b/source/cgame/cg_ents.c
-@@ -376,7 +376,6 @@ static void CG_UpdatePlayerState( void )
- // set up the playerstates
-
- // current
-- index = index;
- CG_SetFramePlayerState( &cg.frame, index );
-
- // old
---- a/source/client/console.c
-+++ b/source/client/console.c
-@@ -1343,7 +1343,7 @@ void Con_KeyDown( int key )
- return;
- }
-
-- if( ( key == K_BACKSPACE ) )
-+ if( key == K_BACKSPACE )
- {
- if( key_linepos > 1 )
- {
diff --git a/games-fps/warsow/files/warsow-1.02-build.patch b/games-fps/warsow/files/warsow-1.02-build.patch
deleted file mode 100644
index b08376a8cc44..000000000000
--- a/games-fps/warsow/files/warsow-1.02-build.patch
+++ /dev/null
@@ -1,624 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Oct 11 15:00:18 UTC 2012
-Subject: build system
-
-a) respect flags/linker
-b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
-c) split LDFLAGS and LDFLAGS_COMMON as per bug
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
-d) don't remove angel-lib (compilation fails, why is this?)
-e) make output verbose
-f) remove start-scripts
-g) address parallel make issues
-
---- source/Makefile
-+++ source/Makefile
-@@ -30,6 +30,16 @@
- # Build Warsow client without server capabilities?
- BUILD_THIN_CLIENT?=NO
-
-+# use system libRocket
-+SYSTEM_LIBS=NO
-+
-+# enable verbosity
-+V=NO
-+
-+ifneq ($(V),YES)
-+Q=@
-+endif
-+
- ###########################################################
-
- ifeq ($(USE_MINGW),YES)
-@@ -50,10 +60,10 @@
- else
- CC?=gcc
- CXX?=g++
--LD=gcc
--LXX?=g++
--AR=ar
--RANLIB=ranlib
-+LD=$(CC)
-+LXX=$(CXX)
-+AR?=ar
-+RANLIB?=ranlib
-
- # 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 +72,7 @@
- ifeq ($(OS),FreeBSD)
- ARCH?=freebsd_$(BASE_ARCH)
- else
--ARCH?=$(BASE_ARCH)
-+ARCH=$(BASE_ARCH)
- endif
-
- SHARED_LIBRARY_EXTENSION=so
-@@ -72,7 +82,7 @@
-
- ifeq ($(DEBUG_BUILD), YES)
- BINDIR=debug
--CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
-+CFLAGS_DEBUG=-D_DEBUG
- else
- BINDIR=release
- endif
-@@ -118,15 +128,22 @@
- LIBROCKET_INC=$(LIBROCKET_DIR)/Include
- LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
-
--CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
-+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
- # add the base of ui to inclusions
- CFLAGS_ROCKET+=-Iui
-
- # static link to custombuilt lib
--LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
-+LDFLAGS_ROCKET=
- # dynamic link to 'official' build
- # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
-
-+ifneq ($(SYSTEM_LIBS),YES)
-+CFLAGS_ROCKET += -DSTATIC_LIB -I$(LIBROCKET_INC)
-+LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
-+else
-+LDFLAGS_ROCKET = -lRocketCore -lRocketControls
-+endif
-+
- ###########################################################
-
- ####################### MINGW ######################
-@@ -195,9 +212,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_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 +226,18 @@
- CFLAGS_MODULE=-DPIC -fPIC
- CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
-
--LDFLAGS_COMMON=$(LDFLAGS)
--LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
-+LDFLAGS_COMMON=
-+LXXFLAGS_COMMON=-lstdc++ -lsupc++
-
- ifeq ($(OS),FreeBSD)
- LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
- else
--LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
-+LDFLAGS_COMMON+= -ldl -lm
- endif
-
- ifneq ($(DEBUG_BUILD),YES)
--LDFLAGS_COMMON+= -s
--LXXFLAGS_COMMON+= -s
-+LDFLAGS_COMMON+=
-+LXXFLAGS_COMMON+=
- endif
-
- ifeq ($(ARCH),x86_64)
-@@ -298,12 +315,19 @@
- ######################################################################################################
- # Helper functions
- ######################################################################################################
-+ifneq ($(V),YES)
- DO_CC=echo " > Compiling $<" && \
-- $(CC) $(CFLAGS_COMMON) -c $< -o $@
-+ $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
- DO_CXX=echo " > Compiling (c++) $<" && \
-- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
-+ $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
- DO_RES=echo " > Compiling resource $<" && \
-- $(RES) $(RESFLAGS_COMMON) -i $< -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 +529,17 @@
-
- all: client openal qf ded cgame game ui irc cin angelwrap tv_server
-
--client: $(BUILDDIRS) message-client compile-client link-client start-script-client
-+client: $(BUILDDIRS) message-client compile-client link-client
- openal: $(BUILDDIRS) message-openal compile-openal link-openal
- qf: $(BUILDDIRS) message-qf compile-qf link-qf
--ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
-+ded: $(BUILDDIRS) message-ded compile-ded link-ded
- cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
- game: $(BUILDDIRS) message-game compile-game link-game
- ui: $(BUILDDIRS) message-ui compile-ui link-ui
- irc: $(BUILDDIRS) message-irc compile-irc link-irc
- cin: $(BUILDDIRS) message-cin compile-cin link-cin
- angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
--tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
-+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
-
- 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
-
-@@ -609,7 +633,14 @@
- @echo "> *********************************************************"
- @echo "> * Building ui"
- @echo "> *********************************************************"
-+
-+ifneq ($(SYSTEM_LIBS),YES)
- compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
-+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
-+else
-+compile-ui: $(OBJS_UI_ROCKET)
-+endif
-+
- link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
- clean-ui:
- @echo " > Removing ui objects" && \
-@@ -617,7 +648,7 @@
-
- $(LIBROCKET_LIB):
- @echo "> * Building Rocket library"
-- @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)
-+ @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)
- @echo "> * Done building RocketCore library."
- @echo "> *********************************************************"
- @echo "> * Continuing ui building..."
-@@ -656,7 +687,6 @@
- @echo "> *********************************************************"
- @echo "> * Building angelwrap"
- @echo "> *********************************************************"
-- -@rm $(ANGELSCRIPT_LIB)
- $(ANGELSCRIPT_INC)/angelscript.h:
- @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- @echo "!!!"
-@@ -668,7 +698,7 @@
-
- $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
- @echo "> * Building Angelscript library first"
-- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
-+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
- @echo "> * Done building angelscript library."
- @echo "> *********************************************************"
- @echo "> * Continuing angelwrap building..."
-@@ -702,69 +732,69 @@
- # DED
- ########
- $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-
- #########
- # CLIENT
- #########
- ifeq ($(OS),Darwin)
- $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
-- @echo " > Linking $@" && \
-- $(LD) -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)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
- endif
-
- #########
- # OPENAL
- #########
- $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-
- #########
- # QF
- #########
- $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-
- ########
- # .SO
- ########
- $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
-- @echo " > Linking $@" && \
-- $(LD) -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)
-+ @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)
-+ @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)
-+ @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)
-+ @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)
-+ @echo " > Linking $@"
-+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
-
- ########
- # TV
- ########
- $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-
- ######################################################################################################
- # Meta Rules
-@@ -776,229 +806,229 @@
- # CLIENT
- ########
- $(BUILDDIR)/client/%.o: qcommon/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: server/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: client/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: ref_gl/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: null/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: matchmaker/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/client/%.o: win32/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: win32/%.rc
-- @$(DO_RES_CLIENT)
-+ $(Q)$(DO_RES_CLIENT)
- else
- ifeq ($(OS),Darwin)
- $(BUILDDIR)/client/%.o: mac/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- $(BUILDDIR)/client/%.o: unix/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- else
- $(BUILDDIR)/client/%.o: unix/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- endif
- endif
-
- $(BUILDDIR)/client/%.o: game/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: gameshared/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BINDIR)/warsow: unix/start_script.sh
-- @echo " > Installing client start script" && \
-- cp $< $@ && \
-+ @echo " > Installing client start script"
-+ $(Q)cp $< $@ && \
- chmod a+x $@
-
- ########
- # OPENAL
- ########
- $(BUILDDIR)/openal/%.o: snd_openal/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-
- $(BUILDDIR)/openal/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # QF
- ########
- $(BUILDDIR)/qf/%.o: snd_qf/%.c
-- @$(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)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND)
- else
- $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
-- @$(DO_CC_MODULE) $(CFLAGS_SDL)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
- endif
-
- $(BUILDDIR)/qf/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
-
- ########
- # DED
- ########
- $(BUILDDIR)/ded/%.o: qcommon/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: server/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/ded/%.o: win32/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
- else
- $(BUILDDIR)/ded/%.o: unix/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
- endif
-
- $(BUILDDIR)/ded/%.o: null/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: game/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: gameshared/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: matchmaker/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BINDIR)/wsw_server: unix/start_script.sh
-- @echo " > Installing dedicated server start script" && \
-- cp $< $@ && \
-+ @echo " > Installing dedicated server start script"
-+ $(Q)cp $< $@ && \
- chmod a+x $@
-
- ########
- # CGAME
- ########
- $(BUILDDIR)/cgame/%.o: cgame/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/cgame/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # GAME
- ########
- $(BUILDDIR)/game/%.o: game/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/game/%.o: game/ai/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/game/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/game/%.o: matchmaker/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # UI.ROCKET
- ########
- $(BUILDDIR)/ui/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ui/%.o: ui/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/as/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
--# @$(DO_CC_MODULE)
-+# $(DO_CC_MODULE)
-
- ########
- # IRC
- ########
- $(BUILDDIR)/irc/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/irc/%.o: irc/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # CIN
- ########
- $(BUILDDIR)/cin/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/cin/%.o: cin/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_CIN)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
-
- ########
- # ANGELWRAP
- ########
- $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-
- ########
- # TV SERVER
- ########
- $(BUILDDIR)/tv_server/%.o: qcommon/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: client/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: tv_server/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/tv_server/%.o: win32/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
- else
- $(BUILDDIR)/tv_server/%.o: unix/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
- endif
-
- $(BUILDDIR)/tv_server/%.o: null/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: gameshared/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BINDIR)/wswtv_server: unix/start_script.sh
-- @echo " > Installing TV server start script" && \
-- 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 @@
- endif
-
- ifeq ($(DEBUG_BUILD),YES)
-- CXXFLAGS += -g -DROCKET_DEBUG
-+ CXXFLAGS += -DROCKET_DEBUG
- else
-- CXXFLAGS += -O2
-+ CXXFLAGS +=
- endif
-
- BUILDDIR=Build/obj
---- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-@@ -47,7 +47,7 @@
- CXX ?= gcc
- # On i686 architecture you may need to add -march=i686 if you get
- # an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
-- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
-+ CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
- endif
-
- AR ?= ar
diff --git a/games-fps/warsow/files/warsow-1.02-pic.patch b/games-fps/warsow/files/warsow-1.02-pic.patch
deleted file mode 100644
index 71c4d8eed690..000000000000
--- a/games-fps/warsow/files/warsow-1.02-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/snd_qf/snd_mix.c
-+++ source/snd_qf/snd_mix.c
-@@ -27,7 +27,7 @@
- int *snd_p, snd_linear_count, snd_vol, music_vol;
- short *snd_out;
-
--#if !defined ( id386 ) || defined ( __MACOSX__ )
-+#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
- #ifdef _WIN32
- #pragma warning( push )
- #pragma warning( disable : 4310 ) // cast truncates constant value
diff --git a/games-fps/warsow/files/warsow-1.03-build.patch b/games-fps/warsow/files/warsow-1.03-build.patch
deleted file mode 100644
index b08376a8cc44..000000000000
--- a/games-fps/warsow/files/warsow-1.03-build.patch
+++ /dev/null
@@ -1,624 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Oct 11 15:00:18 UTC 2012
-Subject: build system
-
-a) respect flags/linker
-b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
-c) split LDFLAGS and LDFLAGS_COMMON as per bug
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
-d) don't remove angel-lib (compilation fails, why is this?)
-e) make output verbose
-f) remove start-scripts
-g) address parallel make issues
-
---- source/Makefile
-+++ source/Makefile
-@@ -30,6 +30,16 @@
- # Build Warsow client without server capabilities?
- BUILD_THIN_CLIENT?=NO
-
-+# use system libRocket
-+SYSTEM_LIBS=NO
-+
-+# enable verbosity
-+V=NO
-+
-+ifneq ($(V),YES)
-+Q=@
-+endif
-+
- ###########################################################
-
- ifeq ($(USE_MINGW),YES)
-@@ -50,10 +60,10 @@
- else
- CC?=gcc
- CXX?=g++
--LD=gcc
--LXX?=g++
--AR=ar
--RANLIB=ranlib
-+LD=$(CC)
-+LXX=$(CXX)
-+AR?=ar
-+RANLIB?=ranlib
-
- # 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 +72,7 @@
- ifeq ($(OS),FreeBSD)
- ARCH?=freebsd_$(BASE_ARCH)
- else
--ARCH?=$(BASE_ARCH)
-+ARCH=$(BASE_ARCH)
- endif
-
- SHARED_LIBRARY_EXTENSION=so
-@@ -72,7 +82,7 @@
-
- ifeq ($(DEBUG_BUILD), YES)
- BINDIR=debug
--CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
-+CFLAGS_DEBUG=-D_DEBUG
- else
- BINDIR=release
- endif
-@@ -118,15 +128,22 @@
- LIBROCKET_INC=$(LIBROCKET_DIR)/Include
- LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
-
--CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
-+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
- # add the base of ui to inclusions
- CFLAGS_ROCKET+=-Iui
-
- # static link to custombuilt lib
--LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
-+LDFLAGS_ROCKET=
- # dynamic link to 'official' build
- # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
-
-+ifneq ($(SYSTEM_LIBS),YES)
-+CFLAGS_ROCKET += -DSTATIC_LIB -I$(LIBROCKET_INC)
-+LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
-+else
-+LDFLAGS_ROCKET = -lRocketCore -lRocketControls
-+endif
-+
- ###########################################################
-
- ####################### MINGW ######################
-@@ -195,9 +212,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_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 +226,18 @@
- CFLAGS_MODULE=-DPIC -fPIC
- CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
-
--LDFLAGS_COMMON=$(LDFLAGS)
--LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
-+LDFLAGS_COMMON=
-+LXXFLAGS_COMMON=-lstdc++ -lsupc++
-
- ifeq ($(OS),FreeBSD)
- LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
- else
--LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
-+LDFLAGS_COMMON+= -ldl -lm
- endif
-
- ifneq ($(DEBUG_BUILD),YES)
--LDFLAGS_COMMON+= -s
--LXXFLAGS_COMMON+= -s
-+LDFLAGS_COMMON+=
-+LXXFLAGS_COMMON+=
- endif
-
- ifeq ($(ARCH),x86_64)
-@@ -298,12 +315,19 @@
- ######################################################################################################
- # Helper functions
- ######################################################################################################
-+ifneq ($(V),YES)
- DO_CC=echo " > Compiling $<" && \
-- $(CC) $(CFLAGS_COMMON) -c $< -o $@
-+ $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
- DO_CXX=echo " > Compiling (c++) $<" && \
-- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
-+ $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
- DO_RES=echo " > Compiling resource $<" && \
-- $(RES) $(RESFLAGS_COMMON) -i $< -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 +529,17 @@
-
- all: client openal qf ded cgame game ui irc cin angelwrap tv_server
-
--client: $(BUILDDIRS) message-client compile-client link-client start-script-client
-+client: $(BUILDDIRS) message-client compile-client link-client
- openal: $(BUILDDIRS) message-openal compile-openal link-openal
- qf: $(BUILDDIRS) message-qf compile-qf link-qf
--ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
-+ded: $(BUILDDIRS) message-ded compile-ded link-ded
- cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
- game: $(BUILDDIRS) message-game compile-game link-game
- ui: $(BUILDDIRS) message-ui compile-ui link-ui
- irc: $(BUILDDIRS) message-irc compile-irc link-irc
- cin: $(BUILDDIRS) message-cin compile-cin link-cin
- angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
--tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
-+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
-
- 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
-
-@@ -609,7 +633,14 @@
- @echo "> *********************************************************"
- @echo "> * Building ui"
- @echo "> *********************************************************"
-+
-+ifneq ($(SYSTEM_LIBS),YES)
- compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
-+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
-+else
-+compile-ui: $(OBJS_UI_ROCKET)
-+endif
-+
- link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
- clean-ui:
- @echo " > Removing ui objects" && \
-@@ -617,7 +648,7 @@
-
- $(LIBROCKET_LIB):
- @echo "> * Building Rocket library"
-- @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)
-+ @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)
- @echo "> * Done building RocketCore library."
- @echo "> *********************************************************"
- @echo "> * Continuing ui building..."
-@@ -656,7 +687,6 @@
- @echo "> *********************************************************"
- @echo "> * Building angelwrap"
- @echo "> *********************************************************"
-- -@rm $(ANGELSCRIPT_LIB)
- $(ANGELSCRIPT_INC)/angelscript.h:
- @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- @echo "!!!"
-@@ -668,7 +698,7 @@
-
- $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
- @echo "> * Building Angelscript library first"
-- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
-+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
- @echo "> * Done building angelscript library."
- @echo "> *********************************************************"
- @echo "> * Continuing angelwrap building..."
-@@ -702,69 +732,69 @@
- # DED
- ########
- $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-
- #########
- # CLIENT
- #########
- ifeq ($(OS),Darwin)
- $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
-- @echo " > Linking $@" && \
-- $(LD) -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)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
- endif
-
- #########
- # OPENAL
- #########
- $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-
- #########
- # QF
- #########
- $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-
- ########
- # .SO
- ########
- $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
-- @echo " > Linking $@" && \
-- $(LD) -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)
-+ @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)
-+ @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)
-+ @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)
-+ @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)
-+ @echo " > Linking $@"
-+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
-
- ########
- # TV
- ########
- $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-
- ######################################################################################################
- # Meta Rules
-@@ -776,229 +806,229 @@
- # CLIENT
- ########
- $(BUILDDIR)/client/%.o: qcommon/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: server/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: client/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: ref_gl/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: null/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: matchmaker/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/client/%.o: win32/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: win32/%.rc
-- @$(DO_RES_CLIENT)
-+ $(Q)$(DO_RES_CLIENT)
- else
- ifeq ($(OS),Darwin)
- $(BUILDDIR)/client/%.o: mac/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- $(BUILDDIR)/client/%.o: unix/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- else
- $(BUILDDIR)/client/%.o: unix/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- endif
- endif
-
- $(BUILDDIR)/client/%.o: game/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: gameshared/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BINDIR)/warsow: unix/start_script.sh
-- @echo " > Installing client start script" && \
-- cp $< $@ && \
-+ @echo " > Installing client start script"
-+ $(Q)cp $< $@ && \
- chmod a+x $@
-
- ########
- # OPENAL
- ########
- $(BUILDDIR)/openal/%.o: snd_openal/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-
- $(BUILDDIR)/openal/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # QF
- ########
- $(BUILDDIR)/qf/%.o: snd_qf/%.c
-- @$(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)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND)
- else
- $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
-- @$(DO_CC_MODULE) $(CFLAGS_SDL)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
- endif
-
- $(BUILDDIR)/qf/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
-
- ########
- # DED
- ########
- $(BUILDDIR)/ded/%.o: qcommon/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: server/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/ded/%.o: win32/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
- else
- $(BUILDDIR)/ded/%.o: unix/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
- endif
-
- $(BUILDDIR)/ded/%.o: null/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: game/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: gameshared/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: matchmaker/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BINDIR)/wsw_server: unix/start_script.sh
-- @echo " > Installing dedicated server start script" && \
-- cp $< $@ && \
-+ @echo " > Installing dedicated server start script"
-+ $(Q)cp $< $@ && \
- chmod a+x $@
-
- ########
- # CGAME
- ########
- $(BUILDDIR)/cgame/%.o: cgame/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/cgame/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # GAME
- ########
- $(BUILDDIR)/game/%.o: game/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/game/%.o: game/ai/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/game/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/game/%.o: matchmaker/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # UI.ROCKET
- ########
- $(BUILDDIR)/ui/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ui/%.o: ui/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/as/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
--# @$(DO_CC_MODULE)
-+# $(DO_CC_MODULE)
-
- ########
- # IRC
- ########
- $(BUILDDIR)/irc/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/irc/%.o: irc/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # CIN
- ########
- $(BUILDDIR)/cin/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/cin/%.o: cin/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_CIN)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
-
- ########
- # ANGELWRAP
- ########
- $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-
- ########
- # TV SERVER
- ########
- $(BUILDDIR)/tv_server/%.o: qcommon/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: client/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: tv_server/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/tv_server/%.o: win32/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
- else
- $(BUILDDIR)/tv_server/%.o: unix/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
- endif
-
- $(BUILDDIR)/tv_server/%.o: null/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: gameshared/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BINDIR)/wswtv_server: unix/start_script.sh
-- @echo " > Installing TV server start script" && \
-- 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 @@
- endif
-
- ifeq ($(DEBUG_BUILD),YES)
-- CXXFLAGS += -g -DROCKET_DEBUG
-+ CXXFLAGS += -DROCKET_DEBUG
- else
-- CXXFLAGS += -O2
-+ CXXFLAGS +=
- endif
-
- BUILDDIR=Build/obj
---- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-@@ -47,7 +47,7 @@
- CXX ?= gcc
- # On i686 architecture you may need to add -march=i686 if you get
- # an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
-- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
-+ CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
- endif
-
- AR ?= ar
diff --git a/games-fps/warsow/files/warsow-1.5-build.patch b/games-fps/warsow/files/warsow-1.5-build.patch
deleted file mode 100644
index 70442fe1fa81..000000000000
--- a/games-fps/warsow/files/warsow-1.5-build.patch
+++ /dev/null
@@ -1,715 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Oct 11 15:00:18 UTC 2012
-Subject: build system
-
-a) respect flags/linker
-b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
-c) split LDFLAGS and LDFLAGS_COMMON as per bug
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
-d) don't remove angel-lib (compilation fails, why is this?)
-e) make output verbose
-f) remove start-scripts
-g) address parallel make issues
-
---- source/Makefile
-+++ source/Makefile
-@@ -33,6 +33,17 @@
- # Build Warsow client without server capabilities?
- BUILD_THIN_CLIENT?=NO
-
-+# use system libRocket
-+SYSTEM_LIBS=NO
-+
-+# enable verbosity
-+V=NO
-+
-+ifneq ($(V),YES)
-+Q=@
-+endif
-+
-+
- ###########################################################
-
- ifeq ($(USE_MINGW),YES)
-@@ -54,10 +65,10 @@
- else
- CC?=gcc
- CXX?=g++
--LD=gcc
--LXX=g++
--AR=ar
--RANLIB=ranlib
-+LD=$(CC)
-+LXX=$(CXX)
-+AR?=ar
-+RANLIB?=ranlib
-
- # 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/)
-@@ -66,7 +77,7 @@
- ifeq ($(OS),FreeBSD)
- ARCH?=freebsd_$(BASE_ARCH)
- else
--ARCH?=$(BASE_ARCH)
-+ARCH=$(BASE_ARCH)
- endif
-
- ifeq ($(ARCH),x86_64)
-@@ -83,7 +94,7 @@
-
- ifeq ($(DEBUG_BUILD), YES)
- BINDIR=debug
--CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
-+CFLAGS_DEBUG=-D_DEBUG
- else
- BINDIR=release
- endif
-@@ -136,7 +147,11 @@
- LIBROCKET_INC=$(LIBROCKET_DIR)/Include
- LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
-
-+ifneq ($(SYSTEM_LIBS),YES)
- CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
-+else
-+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
-+endif
- # add the base of ui to inclusions
- CFLAGS_ROCKET+=-Iui
-
-@@ -231,9 +246,9 @@
- ####################### NORMAL *NIX? ######################
- LOCALBASE?=/usr/local
-
--CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden -Winvalid-pch
--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
-@@ -245,18 +260,18 @@
- CFLAGS_MODULE=-DPIC -fPIC
- CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
-
--LDFLAGS_COMMON=$(LDFLAGS)
--LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
-+LDFLAGS_COMMON=
-+LXXFLAGS_COMMON=-lstdc++ -lsupc++
-
- ifeq ($(OS),FreeBSD)
- LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm
- else
--LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -ldl -O1 -Wl,--as-needed
-+LDFLAGS_COMMON+= -ldl -lm
- endif
-
- ifneq ($(DEBUG_BUILD),YES)
--LDFLAGS_COMMON+= -s
--LXXFLAGS_COMMON+= -s
-+LDFLAGS_COMMON+=
-+LXXFLAGS_COMMON+=
- endif
-
- ifeq ($(ARCH),x86_64)
-@@ -270,8 +285,12 @@
- LDFLAGS_MODULE=-shared
- LDFLAGS_TV_SERVER=-lz -lpthread $(shell curl-config --libs)
-
-+ifneq ($(SYSTEM_LIBS),YES)
- # static link to custombuilt lib
- LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
-+else
-+LDFLAGS_ROCKET = -lRocketCore -lRocketControls
-+endif
-
- # openal
- ifeq ($(BUILD_SND_OPENAL),YES)
-@@ -358,12 +377,18 @@
- ######################################################################################################
- # Helper functions
- ######################################################################################################
-+ifneq ($(V),YES)
- DO_CC=echo " > Compiling $<" && \
- $(CC) $(CFLAGS_COMMON) -c $< -o $@
- DO_CXX=echo " > Compiling (c++) $<" && \
- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
- DO_RES=echo " > Compiling resource $<" && \
- $(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)
-@@ -626,10 +651,10 @@
-
- all: client openal qf ded ui cgame game irc cin ftlib steamlib ref_gl angelwrap tv_server
-
--client: $(BUILDDIRS) message-client compile-client link-client start-script-client
-+client: $(BUILDDIRS) message-client compile-client link-client
- openal: $(BUILDDIRS) message-openal compile-openal link-openal
- qf: $(BUILDDIRS) message-qf compile-qf link-qf
--ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
-+ded: $(BUILDDIRS) message-ded compile-ded link-ded
- ui: $(BUILDDIRS) message-ui compile-ui link-ui
- cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
- game: $(BUILDDIRS) message-game compile-game link-game
-@@ -639,7 +664,7 @@
- steamlib: $(BUILDDIRS) message-steamlib compile-steamlib link-steamlib
- ref_gl: $(BUILDDIRS) message-ref_gl compile-ref_gl link-ref_gl
- angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
--tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
-+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
-
- 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
-
-@@ -733,7 +758,12 @@
- @echo "> *********************************************************"
- @echo "> * Building ui"
- @echo "> *********************************************************"
-+ifneq ($(SYSTEM_LIBS),YES)
- compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
-+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
-+else
-+compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET)
-+endif
- link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
- clean-ui:
- @echo " > Removing ui objects" && \
-@@ -741,7 +771,7 @@
-
- $(LIBROCKET_LIB):
- @echo "> * Building Rocket library"
-- @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)
-+ @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)
- @echo "> * Done building RocketCore library."
- @echo "> *********************************************************"
- @echo "> * Continuing ui building..."
-@@ -827,7 +857,7 @@
-
- $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
- @echo "> * Building Angelscript library first"
-- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
-+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
- @echo "> * Done building angelscript library."
- @echo "> *********************************************************"
- @echo "> * Continuing angelwrap building..."
-@@ -862,80 +892,86 @@
- ########
- $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-
- #########
- # CLIENT
- #########
- ifeq ($(OS),Darwin)
- $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
-- @echo " > Linking $@" && \
-- $(LD) -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)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
- endif
-
- #########
- # OPENAL
- #########
- $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-
- #########
- # QF
- #########
- $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-
- ########
- # .SO
- ########
- $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
-- @echo " > Linking $@" && \
-- $(LXX) -o $@ $^ $(LXXFLAGS_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 $@" && \
-- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE)
--
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-+
-+ifneq ($(SYSTEM_LIBS),YES)
- $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
-- @echo " > Linking $@" && \
-- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-+ @echo " > Linking $@"
-+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-+else
-+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
-+ @echo " > Linking $@"
-+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-+endif
-
- $(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
-- @echo " > Linking $@" && \
-- $(LD) -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)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
-
- $(BINDIR)/libs/ftlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_FTLIB)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB)
-
- $(BINDIR)/libs/steamlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_STEAMLIB)
-- @echo " > Linking $@" && \
-- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB)
-+ @echo " > Linking $@"
-+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB)
-
- $(BINDIR)/libs/ref_gl_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_REF_GL)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL)
-
- $(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP) $(ANGELSCRIPT_LIB)
-- @echo " > Linking $@" && \
-- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
-+ @echo " > Linking $@"
-+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
-
- ########
- # TV
- ########
- $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-+ @echo " > Linking $@"
-+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-
- ######################################################################################################
- # Meta Rules
-@@ -947,177 +983,177 @@
- # CLIENT
- ########
- $(BUILDDIR)/client/%.o: qcommon/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: server/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: client/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: null/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: matchmaker/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/client/%.o: win32/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BUILDDIR)/client/%.o: win32/%.rc
-- @$(DO_RES_CLIENT)
-+ $(Q)$(DO_RES_CLIENT)
- else
- ifeq ($(OS),Darwin)
- $(BUILDDIR)/client/%.o: mac/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- $(BUILDDIR)/client/%.o: unix/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- else
- $(BUILDDIR)/client/%.o: unix/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- endif
- endif
-
- $(BUILDDIR)/client/%.o: gameshared/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
- $(BUILDDIR)/client/%.o: qalgo/%.c
-- @$(DO_CC_CLIENT)
-+ $(Q)$(DO_CC_CLIENT)
-
- $(BINDIR)/warsow: unix/start_script.sh
-- @echo " > Installing client start script" && \
-- cp $< $@ && \
-+ @echo " > Installing client start script"
-+ $(Q)cp $< $@ && \
- chmod a+x $@
-
- ########
- # OPENAL
- ########
- $(BUILDDIR)/openal/%.o: snd_openal/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
-
- $(BUILDDIR)/openal/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
- $(BUILDDIR)/openal/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # QF
- ########
- $(BUILDDIR)/qf/%.o: snd_qf/%.c
-- @$(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)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND)
- else
- $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
-- @$(DO_CC_MODULE) $(CFLAGS_SDL)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
- endif
-
- $(BUILDDIR)/qf/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
- $(BUILDDIR)/qf/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # DED
- ########
- $(BUILDDIR)/ded/%.o: qcommon/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: server/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/ded/%.o: win32/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
- else
- $(BUILDDIR)/ded/%.o: unix/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
- endif
-
- $(BUILDDIR)/ded/%.o: null/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: game/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: gameshared/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: qalgo/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BUILDDIR)/ded/%.o: matchmaker/%.c
-- @$(DO_CC_DED)
-+ $(Q)$(DO_CC_DED)
-
- $(BINDIR)/wsw_server: unix/start_script.sh
-- @echo " > Installing dedicated server start script" && \
-- cp $< $@ && \
-+ @echo " > Installing dedicated server start script"
-+ $(Q)cp $< $@ && \
- chmod a+x $@
-
- ########
- # CGAME
- ########
- $(BUILDDIR)/cgame/%.o: cgame/%.cpp
-- @$(DO_CXX_MODULE)
-+ $(Q)$(DO_CXX_MODULE)
-
- $(BUILDDIR)/cgame/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/cgame/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # GAME
- ########
- $(BUILDDIR)/game/%.o: game/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_GAME)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME)
-
- $(BUILDDIR)/game/%.o: game/ai/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_GAME)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME)
-
- $(BUILDDIR)/game/%.o: gameshared/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_GAME)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_GAME)
-
- $(BUILDDIR)/game/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/game/%.o: matchmaker/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_GAME)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_GAME)
-
- ########
- # UI.ROCKET
- ########
- $(BUILDDIR)/ui/pch/ui_precompiled.h.gch: ui/ui_precompiled.h
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ui/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ui/%.o: ui/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/as/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/parsers/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
- # @$(DO_CC_MODULE)
-@@ -1126,69 +1162,69 @@
- # IRC
- ########
- $(BUILDDIR)/irc/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/irc/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/irc/%.o: irc/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- ########
- # CIN
- ########
- $(BUILDDIR)/cin/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/cin/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/cin/%.o: cin/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_CIN)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
-
- ########
- # FTLIB
- ########
- $(BUILDDIR)/ftlib/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ftlib/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ftlib/%.o: ftlib/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_FTLIB)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_FTLIB)
-
- ########
- # STEAMLIB
- ########
- $(BUILDDIR)/steamlib/%.o: steamlib/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB)
-
- ########
- # REF_GL
- ########
- $(BUILDDIR)/ref_gl/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ref_gl/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ref_gl/%.o: qcommon/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/ref_gl/%.o: ref_gl/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_REF_GL)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_REF_GL)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/ref_gl/%.o: win32/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
- else
- ifeq ($(OS),Darwin)
- $(BUILDDIR)/ref_gl/%.o: mac/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
- else
- $(BUILDDIR)/ref_gl/%.o: unix/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
- endif
- endif
-
-@@ -1196,52 +1232,52 @@
- # ANGELWRAP
- ########
- $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o: qalgo/%.c
-- @$(DO_CC_MODULE)
-+ $(Q)$(DO_CC_MODULE)
-
- $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-
- $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-
- ########
- # TV SERVER
- ########
- $(BUILDDIR)/tv_server/%.o: qcommon/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: client/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: tv_server/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- ifeq ($(USE_MINGW),YES)
- $(BUILDDIR)/tv_server/%.o: win32/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
- else
- $(BUILDDIR)/tv_server/%.o: unix/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
- endif
-
- $(BUILDDIR)/tv_server/%.o: null/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: gameshared/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BUILDDIR)/tv_server/%.o: qalgo/%.c
-- @$(DO_CC_TV_SERVER)
-+ $(Q)$(DO_CC_TV_SERVER)
-
- $(BINDIR)/wswtv_server: unix/start_script.sh
-- @echo " > Installing TV server start script" && \
-- cp $< $@ && \
-+ @echo " > Installing TV server start script"
-+ $(Q)cp $< $@ && \
- chmod a+x $@
-
- ######################################################################################################
---- libsrcs/libRocket/libRocket/Build/Makefile.qfusion
-+++ libsrcs/libRocket/libRocket/Build/Makefile.qfusion
-@@ -15,9 +15,9 @@
- endif
-
- ifeq ($(DEBUG_BUILD),YES)
-- CXXFLAGS += -g -DROCKET_DEBUG
-+ CXXFLAGS += -DROCKET_DEBUG
- else
-- CXXFLAGS += -O2
-+ CXXFLAGS +=
- endif
-
- BUILDDIR=obj
diff --git a/games-fps/warsow/warsow-1.02-r1.ebuild b/games-fps/warsow/warsow-1.02-r1.ebuild
deleted file mode 100644
index e64ae969014d..000000000000
--- a/games-fps/warsow/warsow-1.02-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02-r1.ebuild,v 1.6 2013/07/03 10:06:14 ago Exp $
-
-EAPI=4
-inherit eutils check-reqs gnome2-utils games
-
-MY_P=${PN}_${PV}
-DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://funpark.warsow-esport.net/~${PN}/1.0/${PN}_1.0_unified.tar.gz
- http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_sdk.tar.gz
- http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_update.zip
- mirror://gentoo/${PN}.png"
-
-# ZLIB: bundled angelscript
-LICENSE="GPL-2 ZLIB warsow"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+angelscript debug dedicated irc openal server"
-
-RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
- media-libs/freetype
- net-misc/curl
- sys-libs/zlib
- !dedicated? (
- media-libs/libpng:0
- media-libs/libsdl
- media-libs/libtheora
- media-libs/libvorbis
- x11-libs/libX11
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- virtual/jpeg
- virtual/opengl
- openal? ( media-libs/openal )
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- x11-misc/makedepend
- !dedicated? (
- x11-proto/xineramaproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- )
- openal? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}_sdk/source
-S_U=${WORKDIR}/${PN}_1.0
-S_UPDATE=${WORKDIR}/${MY_P}_update
-
-CHECKREQS_DISK_BUILD="1G"
-CHECKREQS_DISK_USR="500M"
-
-src_unpack() {
- unpack ${PN}_1.0_unified.tar.gz ${MY_P}_sdk.tar.gz
- mkdir "${S_UPDATE}" || die
- cd "${S_UPDATE}" || die
- unpack ${MY_P}_update.zip
-}
-
-src_prepare() {
- sed -i \
- -e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
- qcommon/files.c \
- || die "sed files.c failed"
-
- sed -i \
- -e "s:q_jpeg_mem_src:_&:" \
- ref_gl/r_image.c || die "sed r_image.c failed"
-
- rm -r "${S_U}"/docs/old* || die
-
- cd "${WORKDIR}"/${MY_P}_sdk || die
- epatch "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-pic.patch
- epatch_user
-}
-
-src_compile() {
- yesno() { use ${1} && echo YES || echo NO ; }
-
- use angelscript &&
- emake -C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc
-
- local arch
- if use amd64 ; then
- arch=x86_64
- elif use x86 ; then
- arch=i386
- fi
-
- local myconf
- if use dedicated ; then
- myconf=(
- BUILD_CLIENT=NO
- BUILD_IRC=NO
- BUILD_SND_OPENAL=NO
- BUILD_SND_QF=NO
- BUILD_CIN=NO
- BUILD_SERVER=YES
- BUILD_TV_SERVER=YES
- )
- else
- myconf=(
- BUILD_CLIENT=YES
- BUILD_IRC=$(yesno irc)
- BUILD_SND_OPENAL=$(yesno openal)
- BUILD_SND_QF=YES
- BUILD_CIN=YES
- BUILD_SERVER=$(yesno server)
- BUILD_TV_SERVER=$(yesno server)
- )
- fi
-
- emake \
- V=YES \
- SYSTEM_LIBS=YES \
- BASE_ARCH=${arch} \
- BINDIR=lib \
- BUILD_ANGELWRAP=$(yesno angelscript) \
- DEBUG_BUILD=$(yesno debug) \
- ${myconf[@]}
-}
-
-src_install() {
- cd lib
-
- if ! use dedicated ; then
- newgamesbin ${PN}.* ${PN}
- doicon -s 48 "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN} Warsow
- fi
-
- if use dedicated || use server ; then
- newgamesbin wsw_server.* ${PN}-ded
- newgamesbin wswtv_server.* ${PN}-tv
- fi
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe */*.so
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r "${S_U}"/basewsw
- doins -r "${S_UPDATE}"/basewsw
-
- local so
- for so in basewsw/*.so ; do
- dosym "$(games_get_libdir)"/${PN}/${so##*/} \
- "${GAMES_DATADIR}"/${PN}/${so}
- done
-
- if [[ -e libs ]] ; then
- dodir "${GAMES_DATADIR}"/${PN}/libs
- for so in libs/*.so ; do
- dosym "$(games_get_libdir)"/${PN}/${so##*/} \
- "${GAMES_DATADIR}"/${PN}/${so}
- done
- fi
-
- dodoc "${S_U}"/docs/*
- dodoc "${S_UPDATE}"/docs/*
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-fps/warsow/warsow-1.03.ebuild b/games-fps/warsow/warsow-1.03.ebuild
deleted file mode 100644
index e83ea19403ca..000000000000
--- a/games-fps/warsow/warsow-1.03.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.03.ebuild,v 1.2 2013/12/31 12:38:40 hasufell Exp $
-
-EAPI=5
-inherit eutils check-reqs gnome2-utils flag-o-matic games
-
-BASE_DATA_PV=1.0
-BASE_DATA_P=${PN}_${BASE_DATA_PV}_unified
-DATA_PV=1.02
-UPDATE_P=${PN}_${DATA_PV}_update
-ENGINE_PV=${PV}
-ENGINE_P=${PN}_${ENGINE_PV}_sdk
-
-DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://funpark.warsow-esport.net/~warsow/${BASE_DATA_PV}/${BASE_DATA_P}.tar.gz
- http://www.warsow.net:1337/~warsow/${PV}/${ENGINE_P}.tar.gz
- http://funpark.warsow-esport.net/~warsow/${PV}/${UPDATE_P}.zip
- mirror://gentoo/warsow.png"
-
-# ZLIB: bundled angelscript
-LICENSE="GPL-2 ZLIB warsow"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated irc openal server"
-
-RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
- media-libs/freetype
- net-misc/curl
- sys-libs/zlib
- !dedicated? (
- media-libs/libpng:0
- media-libs/libsdl
- media-libs/libtheora
- media-libs/libvorbis
- x11-libs/libX11
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- virtual/jpeg
- virtual/opengl
- openal? ( media-libs/openal )
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- x11-misc/makedepend
- !dedicated? (
- x11-proto/xineramaproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- )
- openal? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${ENGINE_P}/source
-S_U=${WORKDIR}/${PN}_${BASE_DATA_PV}
-S_UPDATE=${WORKDIR}/${UPDATE_P}
-
-CHECKREQS_DISK_BUILD="1G"
-CHECKREQS_DISK_USR="500M"
-
-src_unpack() {
- unpack ${BASE_DATA_P}.tar.gz ${ENGINE_P}.tar.gz
- mkdir "${S_UPDATE}" || die
- cd "${S_UPDATE}" || die
- unpack ${UPDATE_P}.zip
-}
-
-src_prepare() {
- if [[ $(tc-getCC) =~ clang ]]; then
- einfo "disabling -ffast-math due to clang bug"
- einfo "http://llvm.org/bugs/show_bug.cgi?id=13745"
- append-cflags -fno-fast-math
- append-cxxflags -fno-fast-math
- fi
-
- sed -i \
- -e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
- qcommon/files.c \
- || die "sed files.c failed"
-
- sed -i \
- -e "s:q_jpeg_mem_src:_&:" \
- ref_gl/r_image.c || die "sed r_image.c failed"
-
- rm -r "${S_U}"/docs/old* || die
-
- # edos2unix breaks whitespace files
- einfo "removing dos line breaks"
- find . -type f -exec sed -i 's/\r$//' '{}' + || die
-
- cd "${S}"/.. || die
- epatch "${FILESDIR}"/${PF}-build.patch \
- "${FILESDIR}"/${P}-pic.patch \
- "${FILESDIR}"/{01..03}-${P}-clang.patch
- epatch_user
-}
-
-src_compile() {
- yesno() { use ${1} && echo YES || echo NO ; }
-
- emake -C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc
-
- local arch
- if use amd64 ; then
- arch=x86_64
- elif use x86 ; then
- arch=i386
- fi
-
- local myconf
- if use dedicated ; then
- myconf=(
- BUILD_CLIENT=NO
- BUILD_IRC=NO
- BUILD_SND_OPENAL=NO
- BUILD_SND_QF=NO
- BUILD_CIN=NO
- BUILD_SERVER=YES
- BUILD_TV_SERVER=YES
- )
- else
- myconf=(
- BUILD_CLIENT=YES
- BUILD_IRC=$(yesno irc)
- BUILD_SND_OPENAL=$(yesno openal)
- BUILD_SND_QF=YES
- BUILD_CIN=YES
- BUILD_SERVER=$(yesno server)
- BUILD_TV_SERVER=$(yesno server)
- )
- fi
-
- emake \
- V=YES \
- SYSTEM_LIBS=YES \
- BASE_ARCH=${arch} \
- BINDIR=lib \
- BUILD_ANGELWRAP=YES \
- DEBUG_BUILD=$(yesno debug) \
- ${myconf[@]}
-}
-
-src_install() {
- cd lib
-
- if ! use dedicated ; then
- newgamesbin ${PN}.* ${PN}
- doicon -s 48 "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN} Warsow
- fi
-
- if use dedicated || use server ; then
- newgamesbin wsw_server.* ${PN}-ded
- newgamesbin wswtv_server.* ${PN}-tv
- fi
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe */*.so
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r "${S_U}"/basewsw
- doins -r "${S_UPDATE}"/basewsw
-
- local so
- for so in basewsw/*.so ; do
- dosym "$(games_get_libdir)"/${PN}/${so##*/} \
- "${GAMES_DATADIR}"/${PN}/${so}
- done
-
- if [[ -e libs ]] ; then
- dodir "${GAMES_DATADIR}"/${PN}/libs
- for so in libs/*.so ; do
- dosym "$(games_get_libdir)"/${PN}/${so##*/} \
- "${GAMES_DATADIR}"/${PN}/${so}
- done
- fi
-
- dodoc "${S_U}"/docs/*
- dodoc "${S_UPDATE}"/docs/*
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-fps/warsow/warsow-1.5.ebuild b/games-fps/warsow/warsow-1.5.ebuild
deleted file mode 100644
index c5f293b306e8..000000000000
--- a/games-fps/warsow/warsow-1.5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.5.ebuild,v 1.1 2014/05/11 00:32:18 hasufell Exp $
-
-EAPI=5
-inherit eutils check-reqs gnome2-utils flag-o-matic games
-
-# BASE_DATA_PV=1.0
-# BASE_DATA_P=${PN}_${BASE_DATA_PV}_unified
-DATA_PV=15
-UPDATE_P=${PN}_${DATA_PV}_update
-ENGINE_PV=15
-ENGINE_P=${PN}_${ENGINE_PV}_sdk
-
-DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://www.warsow.net:1337/~warsow/${PV}/${ENGINE_P}.tar.gz
- http://www.warsow.eu/warsow_${DATA_PV}_unified.tar.gz
- mirror://gentoo/warsow.png"
-
-# ZLIB: bundled angelscript
-LICENSE="GPL-2 ZLIB warsow"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated irc openal server"
-
-RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
- media-libs/freetype
- net-misc/curl
- sys-libs/zlib
- !dedicated? (
- media-libs/libpng:0
- media-libs/libsdl
- media-libs/libtheora
- media-libs/libvorbis
- x11-libs/libX11
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- virtual/jpeg
- virtual/opengl
- openal? ( media-libs/openal )
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- x11-misc/makedepend
- !dedicated? (
- x11-proto/xineramaproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- )
- openal? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/source/source
-
-CHECKREQS_DISK_BUILD="1G"
-CHECKREQS_DISK_USR="500M"
-
-src_prepare() {
- if [[ $(tc-getCC) =~ clang ]]; then
- einfo "disabling -ffast-math due to clang bug"
- einfo "http://llvm.org/bugs/show_bug.cgi?id=13745"
- append-cflags -fno-fast-math
- append-cxxflags -fno-fast-math
- fi
-
- sed -i \
- -e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
- qcommon/files.c \
- || die "sed files.c failed"
-
- # edos2unix breaks whitespace files
- einfo "removing dos line breaks"
- find . -type f -exec sed -i 's/\r$//' '{}' + || die
-
- cd "${S}"/.. || die
- epatch "${FILESDIR}"/${PN}-1.5-build.patch \
- "${FILESDIR}"/${PN}-1.03-pic.patch
- epatch_user
-}
-
-src_compile() {
- yesno() { use ${1} && echo YES || echo NO ; }
-
- emake -C ../libsrcs/angelscript/sdk/angelscript/projects/gnuc
-
- local arch
- if use amd64 ; then
- arch=x86_64
- elif use x86 ; then
- arch=i386
- fi
-
- local myconf
- if use dedicated ; then
- myconf=(
- BUILD_CLIENT=NO
- BUILD_IRC=NO
- BUILD_SND_OPENAL=NO
- BUILD_SND_QF=NO
- BUILD_CIN=NO
- BUILD_SERVER=YES
- BUILD_TV_SERVER=YES
- )
- else
- myconf=(
- BUILD_CLIENT=YES
- BUILD_IRC=$(yesno irc)
- BUILD_SND_OPENAL=$(yesno openal)
- BUILD_SND_QF=YES
- BUILD_CIN=YES
- BUILD_SERVER=$(yesno server)
- BUILD_TV_SERVER=$(yesno server)
- )
- fi
-
- emake \
- V=YES \
- SYSTEM_LIBS=YES \
- BASE_ARCH=${arch} \
- BINDIR=lib \
- BUILD_ANGELWRAP=YES \
- DEBUG_BUILD=$(yesno debug) \
- ${myconf[@]}
-}
-
-src_install() {
- cd lib
-
- if ! use dedicated ; then
- newgamesbin ${PN}.* ${PN}
- doicon -s 48 "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN} Warsow
- fi
-
- if use dedicated || use server ; then
- newgamesbin wsw_server.* ${PN}-ded
- newgamesbin wswtv_server.* ${PN}-tv
- fi
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe */*.so
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r "${WORKDIR}"/${PN}_15/basewsw
-
- local so
- for so in basewsw/*.so ; do
- dosym "$(games_get_libdir)"/${PN}/${so##*/} \
- "${GAMES_DATADIR}"/${PN}/${so}
- done
-
- if [[ -e libs ]] ; then
- dodir "${GAMES_DATADIR}"/${PN}/libs
- for so in libs/*.so ; do
- dosym "$(games_get_libdir)"/${PN}/${so##*/} \
- "${GAMES_DATADIR}"/${PN}/${so}
- done
- fi
-
- dodoc "${WORKDIR}"/${PN}_15/docs/*
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}