diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-06-20 20:20:43 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-06-20 20:20:43 +0000 |
commit | b461a0262b99d352ef9035c18f9c00db1fe0827e (patch) | |
tree | 975fd9d67dc69472ee85238c7c4b6e87cfddce72 /games-fps | |
parent | version bump (diff) | |
download | historical-b461a0262b99d352ef9035c18f9c00db1fe0827e.tar.gz historical-b461a0262b99d352ef9035c18f9c00db1fe0827e.tar.bz2 historical-b461a0262b99d352ef9035c18f9c00db1fe0827e.zip |
version bump
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/warsow/ChangeLog | 8 | ||||
-rw-r--r-- | games-fps/warsow/Manifest | 34 | ||||
-rw-r--r-- | games-fps/warsow/files/warsow-1.5.1-build.patch | 717 | ||||
-rw-r--r-- | games-fps/warsow/warsow-1.5.1.ebuild | 178 |
4 files changed, 921 insertions, 16 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index 969b94fd047c..cb289ac868fd 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,12 @@ # 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.57 2014/05/11 00:32:18 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.58 2014/06/20 20:20:40 hasufell Exp $ + +*warsow-1.5.1 (20 Jun 2014) + + 20 Jun 2014; Julian Ospald <hasufell@gentoo.org> + +files/warsow-1.5.1-build.patch, +warsow-1.5.1.ebuild: + version bump *warsow-1.5 (11 May 2014) diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest index 465d67b0d522..65e65b7419bb 100644 --- a/games-fps/warsow/Manifest +++ b/games-fps/warsow/Manifest @@ -11,36 +11,40 @@ AUX warsow-1.02-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5 AUX warsow-1.03-build.patch 18235 SHA256 2651eac7e51e8fabe2782870ab9126f7767e16627c43a5f610d88be714298629 SHA512 85ccd72d70106ec086c5ac84377d1b7c5026b1b98487c104fa88e5a4d5fdbd0b851b98c9c936f925f22e63ce726a453fecd3368946437dbba3623e2f36388c22 WHIRLPOOL 648fbeb9fdef1c37e7bd5cd71c36d82e6243fa7bd9c54ac4c7dc3b98514eb997b97c4103a47d8d4ac32120487d41e69c4e34a830b860600f07ce34d30ea8d61b AUX warsow-1.03-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854 AUX warsow-1.5-build.patch 20543 SHA256 5d1d59324dc0d2fd16016cd5d6dac1f3de6eea54cedacbaa81bf5cf4abfb52dc SHA512 b3f03db19e1ca28f8ed278a192338d76b479798bfa7e075960f3ef23df3ecf1265c680cccf19fb415d8f0e04fbd6390903fc1af4df37ce1e8706471c38fb8799 WHIRLPOOL c72844e5ffe725a86d341f1241aedb247307d47a0d8a2d80f33354670a41e304688af2aaa52f409111d3b5bb5b21218eb35fa073bc42523b9b6ae69980dc9820 +AUX warsow-1.5.1-build.patch 20729 SHA256 afeae3eebb8b143ba735b362a653ab770a4d01576d4d0d4d555b4b307bf031e5 SHA512 5393933a169767b1024bf8e0f55efed54f1aa332b0b740e02abdbeb04610d7530976f10f2c1411e64e17a1cc5014e0c2b5fc56f484648135c9fe6093d22de81b WHIRLPOOL d03ccd08d2b8a2ec2815aaf514101ddb25fb216522fb9c42fea588fd85531edf75e9062aa8cd2ae5b1e30a7dff8bccd7866dcc11e40b42cfc4644816797ae7c0 DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b DIST warsow_1.02_sdk.tar.gz 56541955 SHA256 bec1f0ec26c39defad393578b28eb955504f054599142b096773c28889cabb2c SHA512 d62399baa13341bc87863d123a9d852ec688d0aa279eb626b8c95bda28b7ac1d602c7571e02dfda7dd8ea83a231cd8c3310a0126c1235968291e9e700679fbca WHIRLPOOL 7c44fb252b95b400e829c752c58a4d715b695d56f7e9b35504be9c1e1566c513f101090f7bbe0eabba5aef11ff3f320106fe7ce1d4b7b17e7368979b0b193621 DIST warsow_1.02_update.zip 20582996 SHA256 23efd46590be99140b836125335dc973f606625785926377b60bd1467e661ac1 SHA512 4f0985c9a17e4562d46d289bfc78bf44fa544bdc30af3b0b670572e819966a2fa8f38902cb6810b09ce38a49f7de956177f31bf2858883ad2b3f27d41e6c2276 WHIRLPOOL 978987c70aa8b82a4252505fab95717056701a599d8e52a308206aee59a4cd36520be4f6b202411733d22dcca82f64919423bbd4bcd227d71b6e59cf6859e5b2 DIST warsow_1.03_sdk.tar.gz 63908911 SHA256 98cd7aa25707f9baf97a8e1feb78e1874b6b5dd95af759bf5edda10bc62ed97c SHA512 eb88ba3c7ac3c83b264ff5163af690e187ade4035b4f9560e35830a82b0d87f66bff369ada67ebe89390a33a12cf8285faf8986ffd17c6a9fe45d52a89670314 WHIRLPOOL dae624b0913dbaecf06856b1cfe674bd025a6909caa87ea67124adcab3592481a5ef8ca42824ca20a5e352c4435e91de1ee31ca42ca75235b079246b6f2364e0 DIST warsow_1.0_sdk.tar.gz 56525636 SHA256 2e394b5c50ad206723a59636ab93448f69d8602e710ab334451badf746870e22 SHA512 dee6591fb5ed7150e3e18db20b18366777dbacd4a465074eb3c978a04b7df5140e8a7817a5248542af06d2a6eb972ad986690f16e57ac08f753cccb2470d7bfe WHIRLPOOL e30772b49f37dede19d54e129cc1ca05bf9f01c9a10f372c9c420ceba25514c6a928c12ba61e140efc5ea8d46cbd6db403ca03aee215964173662127b9dbfd59 DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326baf4873d32a6e2f1c3daae14bc92e85ec SHA512 78706093fb4b8684893d9b497fd10f1ce3ef096b68bbf7d36ed2bc775fa649738f0153a723b2788ef6a54d30826ec96bc36899d2e5c230bf09022b98cc105aad WHIRLPOOL efdffd7f358c704a6c08eb1d8c91543db3b76805edba775f88570debfa1b4a9ac64772958831fff7d0be4d72f2d29abbb7610d115e92cdb0fd897a8e31b1059c +DIST warsow_1.51_sdk.tar.gz 89191554 SHA256 ac635c654e088566d30d53e8fab21abd2d40762d7f4ab0e09faa827aac5c4f97 SHA512 64de961de91eee781b90442b275d24e13239dc2b594ece665c24c1d8da75e206a00ab43a2a6f193a953e9b0173b4a93dd18fa94b9b33d92eebcb776493a8b158 WHIRLPOOL 0a1db561eedfb4cafa2bb8f91e4de121adbbb171405828936788c9fa537a821855d89dd7c5b8a9ec186ece0655f1c821b38fa07fc0c2477c61681cf354d3d657 +DIST warsow_1.51_unified.tar.gz 601553865 SHA256 94510d85e4a245b5f8c0c715ae41b1d162c96e06dbfe75ccd99fffb9a76426b5 SHA512 a6c3392010de192d9984655193cb2c4359e9e3959bb39176416936c0227e3f6060bb19149688b89e36285572045c2ab19c6ef8de71ace7cd514e30196da83da9 WHIRLPOOL 1f0bf896dd0aad18e3bf3090d856a6ecbfabfa1873d62f9f5c0ccb1fa8dd0e34f0a22e8c095030c309adf32c85894bbadc77496916bddc6302f7646f500aa6ac DIST warsow_15_sdk.tar.gz 89175325 SHA256 277bbe87744352ee02476dc1bf9258ed5b204345b1b8eb394442dcec6a956949 SHA512 86ed6f0d52d8bce69b015bebfbee95c9e19ee532d70acfa7dc395be83dbc5148dda63e307aeaaa0a2866c3cea3d0df7956fcdd62cfd07ee5b3e7deec77d06082 WHIRLPOOL 8043f8163206d91d245c69744611c941193b5b8d74d73fffa2edd96bf7be5203180dbe0654e1df4f912825793ebc6367c662037329f38a020a2e4d102e5e5554 DIST warsow_15_unified.tar.gz 584507931 SHA256 4b4715d45339bdabfc94d4385df4defac0974743061f63e6a025460ab24668d7 SHA512 a831226f9340f0be6ba90c1d5367dcdbdc80ccdbd4cd80de20c67bb5c1495f1adf9976293a86d16fa4cca67553fea4aa9bb35a463f5cb125ddc8e1c3f7341b10 WHIRLPOOL bb8ec4d4b4047dab937e3a5de56cb9bb16bca726e1f1888a365118876341e5daa805463b9c6dc1e058b7a74f9100692bf156fc4f7fcd5100cd0bc99028ef203e EBUILD warsow-1.0.ebuild 3438 SHA256 2718ea8e803b16d5ae1d291ada956e5993a17e120b08e651e2e3463fde1f7668 SHA512 9565869cec3087019dcf7a66cc9f19825b1e9f713f1fd8875aab053bbcbf8d4c83e24faac5452ef7c4f6b6a5547a0df8483c84d0b78f80deca587bceb823410e WHIRLPOOL fdbd305c14f3db93ff8200277eac6865bee014c04f2b8a81b1a1df3c699f05c8be889119782adfd7bf5e3c406393946b45d685400c4b7f5f4c02965fbb22a82d EBUILD warsow-1.02-r1.ebuild 3805 SHA256 5732403b70af987fdbf756a5631db0cef368ca13c13ed79308b3e4887a129266 SHA512 4bd7ffc596e7edc569513c938ab05b0bd66492a39e6ff6f4347e7754bfbda68272021bf1946aee823dfd8e5e741a6ff7900a632dadd5f9326f67c63b7de37521 WHIRLPOOL 7c8bd180e90588e2b2c123a5f19157b5c2a7cb9d5431c9ddb993627406e8807f42621f9b9e187a9f4ac59b46d17384725cd833133e9e92975e0b9491c62ee28a EBUILD warsow-1.03.ebuild 4278 SHA256 f51b9f88744b332b75b614509ea5afaac344fa5a09b2276efb50db183fc29890 SHA512 99e50b57a1244e8a1bf3a054dd959bd44fcea4253445d4ebd1d0c6506b93ccbae8f18bbea487327349d7ab5737455a8b962b7bbe3738b252576d32405866aa60 WHIRLPOOL 9c0a53af77ed5ac9bfd11af7d5f2527f5377ddcc2442f948f65d14ff90e078ecf91aa17fdde17fe670b96f09a2dfd199922589cafb190ca06b9f4d2a6bfb3e71 +EBUILD warsow-1.5.1.ebuild 3776 SHA256 1e17ece77cf5a359bee71f8efc7ec67fbbfa93bedd53ea448577c75cf55538af SHA512 c7ef2bd2eed28d133b1ed20652d74df48000efbd6be7c8a7ef902b9c0f67b832bb5a03ea07d11dd3fc3be143bbb3975e44efe4320250d53a8f9e53f72a51c1f7 WHIRLPOOL f3e68b56168daf6ea58b3e1f5f62893e0012af5befed785fac8aa2000ff1ae768b0e05f0e28c6322bdced0a0b884b3b9fcafd0ee33e8a211171361d7aa7fe327 EBUILD warsow-1.5.ebuild 3768 SHA256 9651c62efc1929d8bd5a21b4d0d5cf61d78bc1a93a73762c5ff34448bccae3c5 SHA512 81eb7de773a16ae473343e3603d961df5763d669df23279396711b9bc47c44d864fe18f079821f6da3ed3be4ef3e874cb876e80aa75cec0dd5d179b1f9e3ca04 WHIRLPOOL 68fecf7f539377911fbc1108a237eb60e98b88cf36bf3ecf5d20224481fb2634b068073ca1b856e198e96f9121fb4b1a201a2560f1cdf6d01fa89aa704cbf2b5 -MISC ChangeLog 8279 SHA256 1b1c72189f1f892c5ce42e420683ebb620f3a3f5c1ddd24036caa88eef467165 SHA512 1262daf76c546a898d861887660507461138ddad0353a027f5c3269193ebb4b20a5d4959c116d1c8f63d385b3ac19244e8498c56618b4c75840cbcb11f5db9e6 WHIRLPOOL 8a914eba37f67dfccd22774992cce785a795644ad087091c763b5d74fe6e8435c73f1279b56837048a000712f5e641ca97960103e1d99c4bfb118e79d4cbd6bd +MISC ChangeLog 8432 SHA256 17795b7f39862ae48903c4e3812fbee112177c4e0b02a24277256be759c7946d SHA512 9957eb508e9648fa033bccd2dd318beb62697a79856976da3b603c2af7b0c432462a8a7fe84076b02cd6c36b3d53b5e7fdf99d9723f93d7b1114755ef2740abe WHIRLPOOL 3b3f5d1e1cffe8e647b8dedd9dce9e2d0edf4cec1ac32aaeb27009772dd444bf855e71ec96611085dff6d528e696add21891ba96583bcc5daa31d938cb8017ca MISC metadata.xml 347 SHA256 016dbabb997c28f241f054760d9b81b1c43f5161de6d53936a2ebeb78bccdbea SHA512 34e3d6eae3b4665eac573b096d83a2841aee4488cc1a237e54e6e12c0c7ad8caefbbde6b563d1421c9d68cf7fb2b6c2446dfeddb1390971a7630b5efa494cb77 WHIRLPOOL 9d4cbde23eacc798cb4f1ac0c504963d349619229a5c2e926d8fc1348b1fefc53e999cc21e0be0cdca58affd1bfd4a275ae633709af78ca3dc808431fa365db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTbsUWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTpJebXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgu0AP/j9unFsEjd+Qjh/qVK+6eOeN -fId1Sb76vkJluBASFVfInm6V9HjNC1VEU2P7t7JSbR/DehtS3UY9alqdSHpwTKSr -sb25UB+c5QKO91JMPTIJ91xOR5hnHW01tc/T26AklBd5aED1SIel2sNzuOWGx4NX -GI4dGzYw6RXlUkWD6jxUEjcCNJ7wprvFpCSnXfAzrVF6zJM9UnmKhpzY08SkGc8n -RoR+uRxQFiRzs+dYx85PixuVqWAKPWOxZL1YkT0+0Q6FAFwSJDShSaHt6UdQEz2r -oquYanoeKLLGpWvwG3cAnbJG7y7oiTzMQW0dOXs/1z59JzDbtql3B6/Gsx573m+T -i0Hy126PYspiQ7poPvrdnQzO+MHrfCEjU+iJUa4UMcNmaHaRZt/fx8344sAo8Tw3 -LXiTpjV7qeofXiEHA/keZ3sqsNpGB+pSNzMKHy8jI7WIRnnOB0HSD9cYdyS8SOeF -jE666CYrAcPJgB8awd3VVxjVkB3DBaJ3897SC6fuPoElYGSDc7A+LNE8RAWUAyjd -id8aOte80aqDwltceQb2dNGsMW6iNvxUATWuLrdb9W5dO6Rj5jF5draPy44R3X8V -RavcMWPTGafCVzw9vxgrYGrjaA1xcRnAvy7R1EPKV71edpsdGsCfYv+Oilk7vO21 -MX8PgihOlogp7//vO7rJ -=wZQ8 +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg784P+wUIWhBljYe5Kau3U1jrd/01 +z7BJSNZzMby/P+AY5wQPGBy/wALQ0zVqlZr7qrUceHuXQ/OCEOgbgBdNxV3mKI3R +rNrP0ZZnLK6PK524U9aBvflzGqptAEK29Mju3JmdjutakiQR8ofqcEwy/DYQR5Iw +coprwUP3EGzIqgLrGCvLVVdau2KTFKTUzhakca0kpLOf+nyHaefBWUsF+UgaAKaU +ZZ/1rhQf8qGJ+ACW14gaWVod7AGQD2vPDF7sEaIvkcd1G7I6K5vQnOgE4cZYIoYP ++Wc9AOECpYVwul9NqxT671aUPLbyLr1sQPiWPyTZrmrRxkVv/MIYgkEs3vg4Tl+B +b6rHhBY9e03bGicX1lnC5x5htfDlhOUP597T/QFD6UPaO9+qw6lz01w7U6/zOP3E +aNrgCtIoRGwmsOcIsk6zORx39XYEo0Tv41qtk7b8Due2n0OlT7F943DkoUKKSDnu +dqfYdAGMPKMbo55K6ZSSH2GszaMayz63Eq4SctByw+7hmPdgCfJTYihxIK4ySovt +VOucJ8b+ojlSILvEDj8s7v78QmOG6EkVTZJY+LBEuU3VpbtMzGZxLglZYx4wvDQJ +Ptvk7otMADKSf/JOY1QtNwngxYMbPB3nxlJ6HKYX6ormNBwgwf0Dg85/xoTIZUd2 +DaDmWYjFP1N1LciTeGFb +=En9y -----END PGP SIGNATURE----- diff --git a/games-fps/warsow/files/warsow-1.5.1-build.patch b/games-fps/warsow/files/warsow-1.5.1-build.patch new file mode 100644 index 000000000000..97af14eeae3b --- /dev/null +++ b/games-fps/warsow/files/warsow-1.5.1-build.patch @@ -0,0 +1,717 @@ +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) +@@ -357,12 +376,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) +@@ -627,10 +652,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 +@@ -640,7 +665,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 + +@@ -734,7 +759,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" && \ +@@ -742,7 +772,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..." +@@ -828,7 +858,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..." +@@ -863,80 +893,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 +@@ -948,181 +984,181 @@ + # 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: snd_common/%.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) + $(BUILDDIR)/qf/%.o: snd_common/%.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_QF) ++ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF) + 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) +@@ -1131,66 +1167,66 @@ + # 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) +@@ -1201,52 +1237,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.5.1.ebuild b/games-fps/warsow/warsow-1.5.1.ebuild new file mode 100644 index 000000000000..f2561b278151 --- /dev/null +++ b/games-fps/warsow/warsow-1.5.1.ebuild @@ -0,0 +1,178 @@ +# 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.1.ebuild,v 1.1 2014/06/20 20:20: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.51 +UPDATE_P=${PN}_${DATA_PV}_update +ENGINE_PV=1.51 +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.1-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 +} |