Skip to content

Commit

Permalink
Update travis.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
viewizard committed Apr 21, 2019
1 parent ddc74e7 commit 0879d2f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: cpp
sudo: required
dist: trusty
dist: xenial
os:
- linux
- osx
Expand All @@ -12,8 +12,8 @@ compiler:
before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then travis_retry curl -L https://www.libsdl.org/release/SDL2-2.0.5.tar.gz | tar xz; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then pushd SDL2-2.0.5; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then ./configure; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then ./configure --enable-mir-shared=no; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j8; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo make install; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then popd; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then eval "CC=gcc-7 && CXX=g++-7"; fi
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ ENDIF(VORBISFILE_INCLUDE_DIR)
FIND_PACKAGE(Freetype REQUIRED)
IF(FREETYPE_FOUND)
SET(ALL_LIBRARIES ${ALL_LIBRARIES} ${FREETYPE_LIBRARIES})
MESSAGE(STATUS "Found freetype: ${FREETYPE_LIBRARIES}")
INCLUDE_DIRECTORIES(SYSTEM ${FREETYPE_INCLUDE_DIRS})
MESSAGE(STATUS "Found freetype2 headers: ${FREETYPE_INCLUDE_DIRS}")
ELSE(FREETYPE_FOUND)
Expand Down

0 comments on commit 0879d2f

Please sign in to comment.