From 142fcae7466e9af3fc70857a482d0fb6db481975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 7 Jun 2017 18:50:06 +0200 Subject: [PATCH] package/ci: forgot to test building of GlutApplication. It's about to be deprecated/removed, but it should still work. --- package/ci/travis-desktop.sh | 1 + package/ci/travis.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index 6c86cb01c..83f056d14 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -22,6 +22,7 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ -DWITH_AUDIO=ON \ -DWITH_GLFWAPPLICATION=ON \ + -DWITH_GLUTAPPLICATION=$WITH_GLUTAPPLICATION \ -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ -DWITH_${PLATFORM_GL_API}CONTEXT=ON \ diff --git a/package/ci/travis.yml b/package/ci/travis.yml index d81754fee..d5e435d8c 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -5,6 +5,7 @@ addons: packages: - g++-4.7 - libsdl2-dev + - freeglut3-dev - libopenal-dev # GLFW dependencies, libxi-dev will be needed in the future - libxrandr-dev @@ -148,6 +149,8 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ]; then export CXX=g++-4.7; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-sanitizers" ]; then export CXX=clang++-3.8; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop" ]; then export WITH_GLUTAPPLICATION=ON; fi +- if [ "$WITH_GLUTAPPLICATION" != "ON" ]; then export WITH_GLUTAPPLICATION=OFF; fi - if [ "$BUILD_DEPRECATED" != "OFF" ]; then export BUILD_DEPRECATED=ON; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PLATFORM_GL_API=GLX; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ]; then wget -nc http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin && chmod +x android-*.bin && ./android-*.bin -y | grep -v Extracting; fi