From: divverent Date: Tue, 6 Jan 2015 23:26:52 +0000 (+0000) Subject: ODE depends on C++. So let's link that in too... X-Git-Tag: xonotic-v0.8.0~11 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=593030dde26ac5d33fb5edeb7b4a120e151a4290;p=xonotic%2Fdarkplaces.git ODE depends on C++. So let's link that in too... git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12123 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=c5357e1210fe96d01ce3da21980a504681152a14 --- diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index e34de917..72f8dc08 100755 --- a/.travis-script-xonotic.sh +++ b/.travis-script-xonotic.sh @@ -31,7 +31,7 @@ for os in "$@"; do LIB_JPEG=../../../${deps}/lib/libjpeg.a DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" - LIB_ODE="../../../${deps}/lib/libode.a" + LIB_ODE="../../../${deps}/lib/libode.a -lstdc++" DP_LINK_ZLIB=shared' maketargets='release' outputs='darkplaces-glx:darkplaces-linux32-glx darkplaces-sdl:darkplaces-linux32-sdl darkplaces-dedicated:darkplaces-linux32-dedicated' @@ -48,7 +48,7 @@ for os in "$@"; do LIB_JPEG="../../../${deps}/lib/libjpeg.a" DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" - LIB_ODE="../../../${deps}/lib/libode.a" + LIB_ODE="../../../${deps}/lib/libode.a -lstdc++" DP_LINK_ZLIB=shared' maketargets='release' outputs='darkplaces-glx:darkplaces-linux64-glx darkplaces-sdl:darkplaces-linux64-sdl darkplaces-dedicated:darkplaces-linux64-dedicated'