Merge 2fdc89717c into 9435b52911

package/ci/travis-emscripten.sh

@@ -42,8 +42,8 @@ cmake .. \
     -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" \
     -DEMSCRIPTEN_PREFIX=$(echo /usr/local/Cellar/emscripten/*/libexec) \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \
+    -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O2" \
-    -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \
+    -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O2" \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_AUDIO=ON \

package/ci/travis.yml

@@ -1,5 +1,8 @@
 # kate: indent-width 2;
 
+# trusty has cmake >= 2.8.12 in the official package repository
+dist: trusty
+
 addons:
   apt:
     sources:
@@ -9,6 +12,9 @@ addons:
     - g++-4.7
     - cmake
     - libopenal-dev
+    - libxrandr-dev
+    - libxinerama-dev
+    - libxcursor-dev
 
 matrix:
   include:
@@ -39,20 +45,21 @@ matrix:
         - clang-3.8
         - cmake
         - libopenal-dev
+        - libxrandr-dev
+        - libxinerama-dev
+        - libxcursor-dev
   - language: cpp
     os: linux
     compiler: gcc
     env:
     - TARGET=desktop-gles
     - TARGET_GLES2=ON
-  # Disabled because the Ubuntu 12.04 drivers are missing some ES3 entrypoints
+  - language: cpp
-  # Should be enabled after moving to 14.04
+    os: linux
-  #- language: cpp
+    compiler: gcc
-    #os: linux
+    env:
-    #compiler: gcc
+    - TARGET=desktop-gles
-    #env:
+    - TARGET_GLES2=OFF
-    #- TARGET=desktop-gles
-    #- TARGET_GLES2=OFF
   - language: cpp
     os: osx
     compiler: clang