From 127c44dafef16b4ee588fa348e96931c764ecf30 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Sun, 6 Jan 2019 19:53:17 +0100 Subject: [PATCH] Revert "Update .travis.yml" This reverts commit 214aa0c1b0d5c766d22bbb1069ecfb3a78373577. --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d1765237..4b75e19fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,6 @@ before_install: export DONT_TEST=1; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then - MAKE=make; if [[ "$ARCH" == *-android ]]; then export DONT_TEST=1; export RAYLIB_PACKAGE_SUFFIX="-Android-arm64"; @@ -101,12 +100,10 @@ before_install: fi; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then - MAKE=make; export RAYLIB_PACKAGE_SUFFIX="-macOS"; if [ "$INSTALL_GLFW" == "YES" ]; then brew update; brew install glfw; fi; fi - if [ "$TRAVIS_OS_NAME" == "windows" ]; then - MAKE=mingw32-make; export DONT_TEST=1; export RAYLIB_PACKAGE_SUFFIX="-windows"; export CMAKE_ARCH_ARGS='-DPLATFORM=Desktop'; @@ -132,9 +129,9 @@ script: -DUSE_WAYLAND=$WAYLAND -DINCLUDE_EVERYTHING=ON .. - - $RUNNER $MAKE VERBOSE=1 + - $RUNNER make VERBOSE=1 - if [ "$RELEASE" != "NO" ]; then $RUNNER make package; fi - - sudo $RUNNER $MAKE install + - sudo $RUNNER make install - if [ ! "$DONT_TEST" ]; then pkg-config --static --libs raylib; nm -g release/libraylib.a | grep glfwGetProcAddress || (echo "libraylib.a doesn't contain GLFW symbols! Aborting..." && false);