浏览代码

Travis using newer gcc

Thomas Buck 11 年前
父节点
当前提交
599283695b
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 3
    2
      .travis.yml
  2. 1
    0
      src/Console.cpp

+ 3
- 2
.travis.yml 查看文件

5
     - clang
5
     - clang
6
 
6
 
7
 before_install:
7
 before_install:
8
+    - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
8
     - sudo apt-get -qq -y update
9
     - sudo apt-get -qq -y update
9
 
10
 
10
 install:
11
 install:
11
     - sudo apt-get -qq -y install libalut-dev libpng12-dev zlib1g-dev
12
     - sudo apt-get -qq -y install libalut-dev libpng12-dev zlib1g-dev
13
+    - if [ "$CC" = "gcc" ]; then sudo apt-get install -qq gcc-4.8; fi
12
     - wget http://libsdl.org/release/SDL2-2.0.3.tar.gz -O - | tar xz
14
     - wget http://libsdl.org/release/SDL2-2.0.3.tar.gz -O - | tar xz
13
     - (cd SDL2-2.0.3 && ./configure && make -j5 && sudo make install)
15
     - (cd SDL2-2.0.3 && ./configure && make -j5 && sudo make install)
14
     - wget https://libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz -O - | tar xz
16
     - wget https://libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz -O - | tar xz
15
     - (cd SDL2_ttf-2.0.12 && ./configure && make -j5 && sudo make install)
17
     - (cd SDL2_ttf-2.0.12 && ./configure && make -j5 && sudo make install)
16
 
18
 
17
 script:
19
 script:
18
-    - cmake .
19
-    - make
20
+    - (mkdir build && cd build && cmake .. && make)
20
 
21
 
21
 notifications:
22
 notifications:
22
     irc:
23
     irc:

+ 1
- 0
src/Console.cpp 查看文件

6
  */
6
  */
7
 
7
 
8
 #include <iostream>
8
 #include <iostream>
9
+#include <cstring>
9
 
10
 
10
 #include "global.h"
11
 #include "global.h"
11
 #include "Font.h"
12
 #include "Font.h"

正在加载...
取消
保存