package/ci: minor consistency updates.

package/ci/travis-emscripten.sh

@@ -3,11 +3,12 @@ set -ev
 
 git submodule update --init
 
+# Corrade
 git clone --depth 1 git://github.com/mosra/corrade.git
 cd corrade
 
 # Build native corrade-rc
-mkdir build && cd build || exit /b
+mkdir build && cd build
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \

package/ci/travis-ios-simulator.sh

@@ -10,12 +10,12 @@ cd corrade
 # Build native corrade-rc
 mkdir build && cd build
 cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \
     -DCMAKE_INSTALL_RPATH=$HOME/deps-native/lib \
     -DWITH_INTERCONNECT=OFF \
     -DWITH_PLUGINMANAGER=OFF \
-    -DWITH_TESTSUITE=OFF \
+    -DWITH_TESTSUITE=OFF
-    -DCMAKE_BUILD_TYPE=Release
 make -j install
 cd ..
 

package/ci/travis.yml

@@ -59,7 +59,7 @@ install:
 
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX=g++-4.7; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PLATFORM_GL_API=GLX; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PLATFORM_GL_API=CGL; fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then export PLATFORM_GL_API=CGL; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "ios-simulator" ]; then gem install xcpretty; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "emscripten" ]; then brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc; fi
 - if [ "$TARGET" == "desktop" ]; then printf "[General]\ndrivers=null" > ~/.alsoftrc; fi