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 @@
 #!/bin/sh
 
 CMAKE=$ARCH-w64-mingw32.shared-cmake
-CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON"
+CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DERROR_ON_WARNING=OFF"
 NPROC=`nproc`
 CURDIR=/work
 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() {
   set -e
 }
 
-# Try some combinations of cmake options.
-for i in `seq 0 7`; do
-  set +x
-  opts="$CMAKE_EXTRA_FLAGS -DWARNINGS=OFF"
-  set_opt STRICT_ABI
-  set_opt ENABLE_STATIC
-  set_opt ENABLE_SHARED
-  set -x
-  RUN $CMAKE -B$BUILD_DIR -H. $opts
-  RUN rm -rf $BUILD_DIR
-done
-
 if perl -e '
     use Socket qw(PF_INET6 SOCK_STREAM pack_sockaddr_in6 IN6ADDR_LOOPBACK);