]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
ODE depends on C++. So let's link that in too...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 6 Jan 2015 23:26:52 +0000 (23:26 +0000)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 6 Jan 2015 23:35:23 +0000 (00:35 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12123 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=c5357e1210fe96d01ce3da21980a504681152a14

.travis-script-xonotic.sh

index e34de9175f852d2072696bc96f29ff1b6940cfc7..72f8dc08346d261c3bcff839e507c96a35ad3ec2 100755 (executable)
@@ -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'