diff options
| author |  Thomas Edvalson | 2014-04-25 12:52:01 -0400 |
|---|---|---|
| committer | Thomas Edvalson | 2014-04-25 12:52:01 -0400 |
| commit | 322efe83faf2d37fc4e73c6193d54ed2c7da0cf2 (patch) | |
| tree | 18ec37c94c57bc8f39f3c7071d40c99e77bd8c33 | |
| parent | One of the lines wasn't quite unneccesary. (diff) | |
| download | yuzu-322efe83faf2d37fc4e73c6193d54ed2c7da0cf2.tar.gz yuzu-322efe83faf2d37fc4e73c6193d54ed2c7da0cf2.tar.xz yuzu-322efe83faf2d37fc4e73c6193d54ed2c7da0cf2.zip | |
Fixed travis dir problem (third time's the charm)
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6ef2477c0..db3554e19 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -4,11 +4,11 @@ compiler: | |||
| 4 | before_install: | 4 | before_install: |
| 5 | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y | 5 | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y |
| 6 | - sudo apt-get -qq update | 6 | - sudo apt-get -qq update |
| 7 | - sudo apt-get -qq install libgtest-dev g++-4.8 xorg-dev libglu1-mesa-dev | 7 | - sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev |
| 8 | - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 | 8 | - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 |
| 9 | - git clone https://github.com/glfw/glfw.git | 9 | - git clone https://github.com/glfw/glfw.git |
| 10 | - "cd glfw && mkdir build && cd build && cmake .. && make && sudo make install ; cd -" | 10 | - "mkdir glfw/build && cd glfw/build && cmake .. && make && sudo make install ; cd -" |
| 11 | - "cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -" | ||
| 12 | script: | 11 | script: |
| 13 | - cmake . | 12 | - mkdir build && cd build |
| 13 | - cmake .. | ||
| 14 | - make -j4 \ No newline at end of file | 14 | - make -j4 \ No newline at end of file |