diff options
Diffstat (limited to 'scripts/travis')
-rwxr-xr-x | scripts/travis | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/travis b/scripts/travis index 542161d..408bc75 100755 --- a/scripts/travis +++ b/scripts/travis | |||
@@ -22,9 +22,6 @@ if [ "x$ARCH" = "xnative" ]; then | |||
22 | make test | 22 | make test |
23 | else | 23 | else |
24 | sudo apt-get update | 24 | sudo apt-get update |
25 | sudo apt-get install -y python-software-properties | ||
26 | sudo apt-add-repository -y ppa:kalakris/cmake | ||
27 | sudo apt-get update | ||
28 | sudo apt-get install -y cmake ninja-build | 25 | sudo apt-get install -y cmake ninja-build |
29 | cmake -GNinja .. | 26 | cmake -GNinja .. |
30 | ninja | 27 | ninja |
@@ -38,10 +35,6 @@ else | |||
38 | export CC=$CPU-w64-mingw32-gcc | 35 | export CC=$CPU-w64-mingw32-gcc |
39 | 36 | ||
40 | if [ -z $(which $CC) ]; then | 37 | if [ -z $(which $CC) ]; then |
41 | # Update Ubuntu 12.04 with current mingw toolchain | ||
42 | sudo apt-get update | ||
43 | sudo apt-get install -y python-software-properties | ||
44 | sudo apt-add-repository -y ppa:tobydox/mingw-x-precise | ||
45 | sudo apt-get update | 38 | sudo apt-get update |
46 | sudo apt-get install -y $ARCH-x-gcc make | 39 | sudo apt-get install -y $ARCH-x-gcc make |
47 | export PATH=$PATH:/opt/$ARCH/bin | 40 | export PATH=$PATH:/opt/$ARCH/bin |