From 95ee5d0b909dbb3dec63a453405fa07f1150c3d2 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 12 Jan 2015 00:46:36 +0100 Subject: [PATCH 1/2] Travis Win: Multithreaded make --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a8bb8c652..ffea19182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ script: - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j4 VERBOSE=1; fi - - if [ $TARGET_OS != linux ]; then make VERBOSE=1; fi + - if [ $TARGET_OS != linux ]; then make -j4 VERBOSE=1; fi before_deploy: make package deploy: provider: releases From 807c59d3b32a78f9666801de03509eb47ad901ef Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 12 Jan 2015 00:53:35 +0100 Subject: [PATCH 2/2] Travis: Simplify .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ffea19182..b4ba74a56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ before_script: script: - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi - - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j4 VERBOSE=1; fi - - if [ $TARGET_OS != linux ]; then make -j4 VERBOSE=1; fi + - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi + - make -j4 VERBOSE=1 before_deploy: make package deploy: provider: releases