mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
Branch sync
This commit is contained in:
parent
fda1fdeee7
commit
6b702334b9
31
.travis.yml
Normal file
31
.travis.yml
Normal file
@ -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
|
@ -5,7 +5,6 @@ NVIDIA=''
|
|||||||
NATIVE=''
|
NATIVE=''
|
||||||
CONCURRENCY='-j9'
|
CONCURRENCY='-j9'
|
||||||
QMAKE=${QMAKE:-qmake}
|
QMAKE=${QMAKE:-qmake}
|
||||||
RELEASE='CONFIG+=release CONFIG-=debug'
|
|
||||||
|
|
||||||
while test $# -gt 0
|
while test $# -gt 0
|
||||||
do
|
do
|
||||||
@ -18,8 +17,6 @@ do
|
|||||||
;;
|
;;
|
||||||
--travis) CONCURRENCY="-j1"
|
--travis) CONCURRENCY="-j1"
|
||||||
;;
|
;;
|
||||||
--debug) RELEASE="CONFIG+=debug CONFIG-=release"
|
|
||||||
;;
|
|
||||||
--*) echo "bad option $1"; exit 1
|
--*) echo "bad option $1"; exit 1
|
||||||
;;
|
;;
|
||||||
*) echo "unrecognised argument $1"; exit 1
|
*) echo "unrecognised argument $1"; exit 1
|
||||||
@ -36,7 +33,7 @@ do
|
|||||||
if [ "x1" = "x$REBUILD" ]; then
|
if [ "x1" = "x$REBUILD" ]; then
|
||||||
make clean
|
make clean
|
||||||
fi
|
fi
|
||||||
$QMAKE "$NVIDIA" "$NATIVE" $RELEASE
|
$QMAKE "$NVIDIA" "$NATIVE"
|
||||||
make $CONCURRENCY
|
make $CONCURRENCY
|
||||||
if [ "x$?" != "x0" ]; then
|
if [ "x$?" != "x0" ]; then
|
||||||
echo "Build failed! Check output for errors."
|
echo "Build failed! Check output for errors."
|
||||||
|
Loading…
Reference in New Issue
Block a user