0ad-12636_alpha11 added.
This commit is contained in:
Kolan Sh
parent
1d2a981af2
commit
b457f37e97
|
|
@ -0,0 +1,29 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit games
|
||||
|
||||
MY_P=0ad-0.0.11-alpha
|
||||
DESCRIPTION="Data files for 0ad"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 LPPL-1.3c BitstreamVera"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 -*"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
rm binaries/data/tools/fontbuilder/fonts/*.txt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/0ad
|
||||
doins -r binaries/data/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,2 +1,4 @@
|
|||
DIST 0ad-r11863-alpha-unix-data.tar.xz 310994700 RMD160 2cbbd285d3710bf18c78cfdf2ebb9cf59ab7d188 SHA1 d46831056023be70e9c2c3bed5bb84bdbcd9b2aa SHA256 76702023402361d27b61eea37034b08e9e19b282e4cdd69954495d2dd087b90a
|
||||
EBUILD 0ad-data-11863_alpha10.ebuild 646 RMD160 3eee9cf45eef4d984dc50bff8042801380b02736 SHA1 041dae6d0db03d5e8645edc6072cf2b2bfe70e93 SHA256 99fb276d2b5e803b353b1e238be540b7f02b9d47297cc144bc97bfbd89b2c2f6
|
||||
DIST 0ad-0.0.11-alpha-unix-data.tar.xz 350967036 SHA256 a28dd9160637bc1345223ec6f9c36bb693350e9dcc35a3194f43ed463b3ba20e SHA512 26dc6ea00b67c64041f34fe55ad1280693eae7549161fd85ae1551945ccc5e2afb01ee8834f232d573c15c0d5c81875d047cc69885328bf34c365c554eb12124 WHIRLPOOL 2a37584a0c69132386a9312c77e4a82f2413065b3bcfbf4c3964c78f1bb564f6f099ff0f240591bbc25d07b9746ddc8c9cc7cf9ca3619ece05201253c2b91794
|
||||
DIST 0ad-r11863-alpha-unix-data.tar.xz 310994700 SHA256 76702023402361d27b61eea37034b08e9e19b282e4cdd69954495d2dd087b90a SHA512 58a9b10e961fbd8e30d1e88bdb7d6ac8e4da8a85455f66bd2d018a9df01e5de88aefacca393d8771f1bada49fd5b888492c8b15f7ddb4700a06de640df226316 WHIRLPOOL 1707bfa712e82db7dbbbc9731bcc465ff33d37ef73f8cbc002a8e4bba94a1367568aa1efebec7f88482d9790239be7e109a395ef139be2472c256ea5f4b563e6
|
||||
EBUILD 0ad-data-11863_alpha10.ebuild 646 SHA256 99fb276d2b5e803b353b1e238be540b7f02b9d47297cc144bc97bfbd89b2c2f6 SHA512 8fb78459d1c92ddabc867ddf735333b784f3a17af66f4e02603e750c236a4c2380086af83ede072de49b58a4341eaa4d26e413b587ddeaa9849ccbf30d01de0f WHIRLPOOL c707f3a4c6e7469087ceb5242623894ac7d6ef9bbd2ab7aba514af5501aaf1078af912ccf0a84857b48a654ae5cc3ea71c27fcc8bbf934c3f7f270f548fe5858
|
||||
EBUILD 0ad-data-12636_alpha11.ebuild 606 SHA256 fc99e3ba14b2dee5f49e62f5b31eb4c836998edea843531c966dfe449f533b79 SHA512 d10d846ac85866756b513b018e2746455c7ad2b38edeb66a8b01106e5f7aece78473591c5677909540b1b2aa38fb2171c328a49e9ead6d8c7a69f35d7325f09c WHIRLPOOL 6e54f4647bbc2a020248871bc24991418c81d58a78781b38da62dc495fd9c768a3ec41c790fb90f5aceb5242fcca91e0a2596d1a1d516d4f08373b346229e0e0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,115 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils wxwidgets toolchain-funcs games
|
||||
|
||||
MY_P=0ad-0.0.11-alpha
|
||||
DESCRIPTION="A free, real-time strategy game of ancient warfare"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 -*"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
~dev-lang/spidermonkey-1.8.5
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
~games-strategy/0ad-data-${PV}
|
||||
media-gfx/nvidia-texture-tools
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
net-libs/enet:1.3
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-{gentoo,pch}.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--with-system-nvtt
|
||||
--with-system-enet
|
||||
--with-system-mozjs185
|
||||
--minimal-flags
|
||||
$(usex fam "" "--without-fam")
|
||||
$(usex pch "" "--without-pch")
|
||||
$(usex test "" "--without-tests")
|
||||
$(usex audio "" "--without-audio")
|
||||
$(usex editor "--atlas" "")
|
||||
--collada
|
||||
--bindir="${GAMES_BINDIR}"
|
||||
--libdir="$(games_get_libdir)"/${PN}
|
||||
--datadir="${GAMES_DATADIR}"/${PN}
|
||||
)
|
||||
|
||||
# stock premake4 does not work, use the shipped one
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# regenerate scripts.c so our patch applies
|
||||
cd "${S}"/build/premake/premake4 || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
|
||||
|
||||
# rebuild premake again... this is the most stupid build system
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# run premake to create build scripts
|
||||
cd "${S}"/build/premake || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 \
|
||||
--file="premake4.lua" \
|
||||
--outpath="../workspaces/gcc/" \
|
||||
--platform=$(usex amd64 "x64" "x32") \
|
||||
--os=linux \
|
||||
"${myconf[@]}" \
|
||||
gmake || die "Premake failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build 3rd party fcollada
|
||||
emake -C libraries/fcollada/src
|
||||
|
||||
# build 0ad
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN} "0 A.D."
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
EAPI=4
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
|
|
@ -11,14 +11,14 @@ inherit eutils subversion wxwidgets games
|
|||
MY_PV="r${PV%_*}-alpha"
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="A free, real-time strategy game"
|
||||
DESCRIPTION="A free, real-time strategy game of ancient warfare"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
ESVN_REPO_URI="http://svn.wildfiregames.com/public/ps/trunk"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS=""
|
||||
IUSE="+audio +editor fam +pch test"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
~dev-lang/spidermonkey-1.8.5
|
||||
|
|
@ -34,12 +34,11 @@ RDEPEND="
|
|||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXcursor
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
|
||||
fam? ( virtual/fam )
|
||||
"
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
|
@ -66,7 +65,6 @@ src_configure() {
|
|||
--with-system-nvtt \
|
||||
--with-system-enet \
|
||||
--with-system-mozjs185 \
|
||||
$(usex fam "" "--without-fam") \
|
||||
$(usex pch "" "--without-pch") \
|
||||
$(usex test "" "--without-tests") \
|
||||
$(usex audio "" "--without-audio") \
|
||||
|
|
@ -77,34 +75,32 @@ src_configure() {
|
|||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C build/workspaces/gcc verbose=1 || die
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test || die "test phase failed"
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# data
|
||||
insinto "${GAMES_DATADIR}"/${PN}
|
||||
doins -r binaries/data/* || die
|
||||
doins -r binaries/data/*
|
||||
|
||||
# bin
|
||||
dogamesbin binaries/system/pyrogenesis || die
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
# libs
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so || die
|
||||
if use editor ; then
|
||||
doexe binaries/system/libAtlasUI.so || die
|
||||
fi
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
# other
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN}
|
||||
make_desktop_entry ${PN} "0 A.D."
|
||||
|
||||
# permissions
|
||||
prepgamesdirs
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
DIST 0ad-r11863-alpha-unix-build.tar.xz 8657204 RMD160 0c2a4efec65b8df48fe7b5e3af292c5e32c47e84 SHA1 e52a2a86b585d9bb6fee38ec7a1964b1a704c367 SHA256 46c08d380ce098d3d8f577d04d602bb245dfbb7f7da7b1ad009e7a0d4751435f
|
||||
DIST 0ad-r11863-alpha-unix-data.tar.xz 310994700 RMD160 2cbbd285d3710bf18c78cfdf2ebb9cf59ab7d188 SHA1 d46831056023be70e9c2c3bed5bb84bdbcd9b2aa SHA256 76702023402361d27b61eea37034b08e9e19b282e4cdd69954495d2dd087b90a
|
||||
EBUILD 0ad-11863.ebuild 3466 RMD160 d61d77b6922144d941dd2ca2645345ce3b15a318 SHA1 3a02f15c44aefc59927048a7013dc43d894b34a5 SHA256 539b259755f8311f2481ac86d6a864a8ad63010808ff51d2e01d169c920bec9b
|
||||
EBUILD 0ad-99999.ebuild 2312 SHA256 e5ac8c3f870dd8e32fc79797016aa531e25605560067de50f7531c82c65f388f SHA512 3e938facf67a0ece2621d10411409de9f01b70b45bb4c3f5c6edfc87d1de5b32c0746825673f192c3839ed8ccb7e8ace629d76ba5ebcd42d80ac34d9bf835f55 WHIRLPOOL 5b91f8a50820c729b9a259c4b7f1470f30b7ee1acc25b1816ad635d458f1547ab4644079773e285a3a638452985863a569d5f93fe8def8bc6a337796ed8b7a77
|
||||
AUX 0ad-12636_alpha11-gentoo.patch 4337 SHA256 1393d3fe8d668778ea29606e246d0c71f6866ec43c640138d86a5d3d06baf040 SHA512 cee9846fd6d11199fb41bc163ff694f1a49014ab7f2011a560d7e964ed197efaa312ad9dfc6bd5535c2e81d75af123c34b05069dba49f66f1447af2485dcf993 WHIRLPOOL 052cdf3d556051cd44e2047261b0a8abe497571cb6def12128186fa649cfae20f83ef4524062f483937dd37f7afe01c572eb53de24e9beb373f0e40943e2a6c5
|
||||
AUX 0ad-12636_alpha11-pch.patch 792 SHA256 67c9fa892121b9fa1742732f2fd88098cf95f6d2177afd6ec158af2b713249f0 SHA512 77a866500dd2b10b38dd18b69f69e3a17a3bde0f0047e42e8c5e1a979eda7078466fd79a6dd383d971848271d2b9f0fa659cf7056b2d116a70375b68897f1589 WHIRLPOOL 013586b8aa545eedf19be4766acbf647a49bf598bbae1db330999b465fb762c3cb436a5e08a8bf0846b828dedec67a3cb6a69f94a2a345accbb5974b1854ce7c
|
||||
DIST 0ad-0.0.11-alpha-unix-build.tar.xz 8682272 SHA256 a218c42bce111d0bcb02b3a18eb14d7c06a839b8863df362083ebd0835d3c6a3 SHA512 c68b6f1d6dae5d2055910834a38d2bdb03c58f87dd4bc756947f8cda8d585c6a2a0e7950b43289671397e6f1d13247fafe7c3d0bd1f61015ab22414cfebd6e66 WHIRLPOOL a8a64df7aa3587aef7fc12394597b4d92131d8d4081328035364073f032c08850a493cbeddd64fb61dcbc07831737977e04495d41c8bdb342d2409cc8da03ba9
|
||||
DIST 0ad-r11863-alpha-unix-build.tar.xz 8657204 SHA256 46c08d380ce098d3d8f577d04d602bb245dfbb7f7da7b1ad009e7a0d4751435f SHA512 a2290c2f3d4d72e7bfea76c5acb1530dffdad9565f0613d87a9ea4616175f435b4d58613c91753081fd973ac9c8f17e6ee9c8617294bcd0d881862a75df19cb7 WHIRLPOOL 759237396e2ec9d79219493e0e835fbf42ebaeb84899025a6ffb1a3feaff51f2f70dd2027dc2e409bde2dfa03ac124ca340cc7952c5050de0d475239786bf249
|
||||
DIST 0ad-r11863-alpha-unix-data.tar.xz 310994700 SHA256 76702023402361d27b61eea37034b08e9e19b282e4cdd69954495d2dd087b90a SHA512 58a9b10e961fbd8e30d1e88bdb7d6ac8e4da8a85455f66bd2d018a9df01e5de88aefacca393d8771f1bada49fd5b888492c8b15f7ddb4700a06de640df226316 WHIRLPOOL 1707bfa712e82db7dbbbc9731bcc465ff33d37ef73f8cbc002a8e4bba94a1367568aa1efebec7f88482d9790239be7e109a395ef139be2472c256ea5f4b563e6
|
||||
EBUILD 0ad-11863.ebuild 3466 SHA256 539b259755f8311f2481ac86d6a864a8ad63010808ff51d2e01d169c920bec9b SHA512 4ee171e01323d073d0131198d049aa0b2bf35b5272bff4b10e424afc61a894718fcfd0866ed06b0e6c98b23e0137093114c0887667a37aa8da381ed8f8b84b32 WHIRLPOOL c36f15e43ae500a003ecd45f5d7de4739f0d3348ea1f3170bc15c0efb1e3ba27d77d4a3d74300549b3d5e469c25df80516f57a251665f52560ca89f1b6daaaf9
|
||||
EBUILD 0ad-12636_alpha11.ebuild 2880 SHA256 751b3aa6c76ebf70556159fee0c01ea5628a108ad8875b07da16aa6b51c07a6b SHA512 34465121f478b738b01e0387e91f08aa904679fdea10e1c164249b3c884b2fc48bfd310362ab7311a6891ddf754e776e66aea5671514c08a652f108c2e413259 WHIRLPOOL a24f8cc52241a38f1e4b8c6f5bb07c4ecd3fb80c6fe6b033c8f97535337f6e850299826a46d44a6116de4afdba072cc0d5a80aeedde05e45df9c39453027818c
|
||||
EBUILD 0ad-99999.ebuild 2283 SHA256 a42ed114292e61344933a9c8bad8f8ab1931ff6c092ac8fc0956fd3f6c505faf SHA512 2ae4d4d59f1741fd64567c8657fc46d8d35e05f35bb9ed1accd15847516be04648c23b70ccab598539fc5924174a46cf8f40053521215cdc64151b221bab34f3 WHIRLPOOL 58716270a346041f4c8aec9c163aaeaf68e3606d6c73f911c871e20b5096d482c1138c51b4b41ab0aeacca1c73266f093a9f9b5855b89ac61498499fd1ed1712
|
||||
|
|
|
|||
|
|
@ -0,0 +1,135 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Jun 24 18:32:38 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
respect flags
|
||||
let stripping be handled by the system
|
||||
|
||||
fix minimal-flags option:
|
||||
leave -fvisibility=hidden active
|
||||
leave conditional -fpc-proprocess active
|
||||
|
||||
--- build/premake/premake4.lua
|
||||
+++ build/premake/premake4.lua
|
||||
@@ -135,7 +135,7 @@
|
||||
|
||||
function project_set_build_flags()
|
||||
|
||||
- flags { "Symbols", "NoEditAndContinue" }
|
||||
+ flags { "NoEditAndContinue" }
|
||||
if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
|
||||
-- adds the -Wall compiler flag
|
||||
flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
|
||||
@@ -232,33 +232,19 @@
|
||||
"-fno-omit-frame-pointer"
|
||||
}
|
||||
|
||||
- if not _OPTIONS["without-pch"] then
|
||||
- buildoptions {
|
||||
- -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
- -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
- "-fpch-preprocess"
|
||||
- }
|
||||
- end
|
||||
-
|
||||
- if arch == "x86" or arch == "amd64" then
|
||||
- buildoptions {
|
||||
- -- enable SSE intrinsics
|
||||
- "-msse"
|
||||
- }
|
||||
- end
|
||||
|
||||
if os.is("linux") or os.is("bsd") then
|
||||
- linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" }
|
||||
+ linkoptions { "-Wl,--no-undefined" }
|
||||
end
|
||||
|
||||
- if arch == "x86" then
|
||||
- buildoptions {
|
||||
- -- To support intrinsics like __sync_bool_compare_and_swap on x86
|
||||
- -- we need to set -march to something that supports them
|
||||
- "-march=i686"
|
||||
- }
|
||||
- end
|
||||
+ end
|
||||
|
||||
+ if not _OPTIONS["without-pch"] then
|
||||
+ buildoptions {
|
||||
+ -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
+ -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
+ "-fpch-preprocess"
|
||||
+ }
|
||||
end
|
||||
|
||||
if arch == "arm" then
|
||||
@@ -281,13 +267,11 @@
|
||||
end
|
||||
end
|
||||
|
||||
- if not _OPTIONS["minimal-flags"] then
|
||||
buildoptions {
|
||||
-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
|
||||
-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
|
||||
"-fvisibility=hidden"
|
||||
}
|
||||
- end
|
||||
|
||||
-- X11 includes may be installed in one of a gadzillion of three places
|
||||
-- Famous last words: "You can't include too much! ;-)"
|
||||
--- libraries/fcollada/src/Makefile
|
||||
+++ libraries/fcollada/src/Makefile
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
CXX ?= g++
|
||||
CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
|
||||
-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
|
||||
-CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
|
||||
+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
|
||||
+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
|
||||
# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
|
||||
CXXFLAGS_TEST := -O0 -g -D_DEBUG
|
||||
LIBS += `pkg-config libxml-2.0 --libs`
|
||||
--- build/premake/premake4/src/tools/gcc.lua
|
||||
+++ build/premake/premake4/src/tools/gcc.lua
|
||||
@@ -136,8 +136,6 @@
|
||||
if not cfg.flags.Symbols then
|
||||
if cfg.system == "macosx" then
|
||||
table.insert(result, "-Wl,-x")
|
||||
- else
|
||||
- table.insert(result, "-s")
|
||||
end
|
||||
end
|
||||
|
||||
--- build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
+++ build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
@@ -26,9 +26,9 @@
|
||||
DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- LDFLAGS += -s -rdynamic
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
+ LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
LDDEPS +=
|
||||
@@ -48,8 +48,8 @@
|
||||
DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -g
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -g
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
@@ -302,4 +302,4 @@
|
||||
$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
|
||||
|
||||
-include $(OBJECTS:%.o=%.d)
|
||||
--include $(GCH:%.h.gch=%.h.d)
|
||||
\ No newline at end of file
|
||||
+-include $(GCH:%.h.gch=%.h.d)
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
http://trac.wildfiregames.com/ticket/1664
|
||||
|
||||
Index: /ps/trunk/source/soundmanager/js/SoundPlayer.cpp
|
||||
===================================================================
|
||||
--- /ps/trunk/source/soundmanager/js/SoundPlayer.cpp (revision 12654)
|
||||
+++ /ps/trunk/source/soundmanager/js/SoundPlayer.cpp (revision 12655)
|
||||
@@ -24,4 +24,6 @@
|
||||
#include "ps/Filesystem.h"
|
||||
#include "soundmanager/SoundManager.h"
|
||||
+
|
||||
+#include <sstream>
|
||||
|
||||
|
||||
Index: /ps/trunk/source/soundmanager/js/MusicSound.cpp
|
||||
===================================================================
|
||||
--- /ps/trunk/source/soundmanager/js/MusicSound.cpp (revision 12654)
|
||||
+++ /ps/trunk/source/soundmanager/js/MusicSound.cpp (revision 12655)
|
||||
@@ -26,4 +26,6 @@
|
||||
#include "ps/Filesystem.h"
|
||||
#include "soundmanager/SoundManager.h"
|
||||
+
|
||||
+#include <sstream>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue