diff options
Diffstat (limited to 'other')
-rw-r--r-- | other/travis/env-windows.sh | 2 | ||||
-rwxr-xr-x | other/travis/toxcore-script | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/other/travis/env-windows.sh b/other/travis/env-windows.sh index 6f7f0914..d5e485f1 100644 --- a/other/travis/env-windows.sh +++ b/other/travis/env-windows.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | CMAKE=$ARCH-w64-mingw32.shared-cmake | 3 | CMAKE=$ARCH-w64-mingw32.shared-cmake |
4 | CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON" | 4 | CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DERROR_ON_WARNING=OFF" |
5 | NPROC=`nproc` | 5 | NPROC=`nproc` |
6 | CURDIR=/work | 6 | CURDIR=/work |
7 | RUN_TESTS=true | 7 | RUN_TESTS=true |
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script index 54ee41a9..763be2e4 100755 --- a/other/travis/toxcore-script +++ b/other/travis/toxcore-script | |||
@@ -10,18 +10,6 @@ set_opt() { | |||
10 | set -e | 10 | set -e |
11 | } | 11 | } |
12 | 12 | ||
13 | # Try some combinations of cmake options. | ||
14 | for i in `seq 0 7`; do | ||
15 | set +x | ||
16 | opts="$CMAKE_EXTRA_FLAGS -DWARNINGS=OFF" | ||
17 | set_opt STRICT_ABI | ||
18 | set_opt ENABLE_STATIC | ||
19 | set_opt ENABLE_SHARED | ||
20 | set -x | ||
21 | RUN $CMAKE -B$BUILD_DIR -H. $opts | ||
22 | RUN rm -rf $BUILD_DIR | ||
23 | done | ||
24 | |||
25 | if perl -e ' | 13 | if perl -e ' |
26 | use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK); | 14 | use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK); |
27 | 15 | ||