Branch sync

.travis.yml

@@ -0,0 +1,31 @@
+language: cpp
+sudo: true
+script:
+# install standard deps (currently only libtbb is fine in 12.04)
+- sudo apt-get update
+- sudo apt-get install libtbb-dev
+# gcc from ppa, because 12.04's is too old
+- sudo apt-get install python-software-properties
+- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+- sudo apt-get update
+- sudo apt-get install gcc-4.8 g++-4.8
+# qt 5.4 from ppa, because 12.04 only has 4.8
+# yeah, really rather unofficial ppa but it's all that exists
+- sudo apt-add-repository -y ppa:beineri/opt-qt541
+- sudo apt-get update
+- sudo apt-get install qt54-meta-full
+# glm from source, because 12.04's is too old
+- git clone https://github.com/g-truc/glm.git
+- cd glm && cmake . && make && sudo make install && cd ..
+- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
+- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
+# opencl from Intel's site, because 12.04's is nonexistant
+- wget http://registrationcenter.intel.com/irc_nas/2563/intel_sdk_for_ocl_applications_2012_x64.tgz
+- tar -xzvf intel_sdk_for_ocl_applications_2012_x64.tgz
+- sudo apt-get install alien
+- sudo alien -i intel_ocl_sdk_2012_x64.rpm
+- sudo ln -s /usr/lib64/libOpenCL.so /usr/lib/libOpenCL.so
+# finally, run the build
+- source /opt/qt54/bin/qt54-env.sh
+- g++ --version
+- Builds/QtCreator/build_all.sh --travis

Builds/QtCreator/build_all.sh

@@ -5,7 +5,6 @@ NVIDIA=''
 NATIVE=''
 CONCURRENCY='-j9'
 QMAKE=${QMAKE:-qmake}
-RELEASE='CONFIG+=release CONFIG-=debug'
 
 while test $# -gt 0
 do
@@ -18,8 +17,6 @@ do
             ;;
         --travis) CONCURRENCY="-j1"
             ;;
-        --debug) RELEASE="CONFIG+=debug CONFIG-=release"
-            ;;
         --*) echo "bad option $1"; exit 1
             ;;
         *) echo "unrecognised argument $1"; exit 1
@@ -36,7 +33,7 @@ do
   if [ "x1" = "x$REBUILD" ]; then
     make clean
   fi
-  $QMAKE "$NVIDIA" "$NATIVE" $RELEASE
+  $QMAKE "$NVIDIA" "$NATIVE"
   make $CONCURRENCY
   if [ "x$?" != "x0" ]; then
     echo "Build failed! Check output for errors."