# HG changeset patch
# User Chris Cannam
# Date 1499677819 -3600
# Node ID 81c92307f0d370f37b6a90ba8bc5aeaf430bf477
# Parent  d2221cb43cd57207c99125d59d84470842822711# Parent  1fb1556b74be41f145f0cb8430a46a2a294a73d6
Merge

diff -r d2221cb43cd5 -r 81c92307f0d3 .appveyor.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.appveyor.yml	Mon Jul 10 10:10:19 2017 +0100
@@ -0,0 +1,23 @@
+
+branches:
+  only:
+  - vext
+
+install:
+  - cinst --allow-empty-checksums smlnj
+  - ps: '"[hostfingerprints]" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
+  - ps: '"code.soundsoftware.ac.uk = 66:ef:e2:0e:e3:55:93:9a:33:aa:2a:e9:fe:be:21:c2:a2:8d:4f:f1" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
+  - ps: '"[hostsecurity]" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
+  - ps: '"code.soundsoftware.ac.uk = code.soundsoftware.ac.uk:fingerprints=sha256:64:75:f6:47:15:de:b4:51:ea:96:e2:f4:8a:f5:53:a5:11:c8:dd:82:73:5d:bd:54:18:cb:c8:9d:10:37:28:85" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
+  - ps: type $env:USERPROFILE\mercurial.ini
+
+before_build:
+  - set QTDIR=C:\Qt\5.8\msvc2015_64
+  - set PATH=%PATH%;%QTDIR%\bin;C:\Program Files (x86)\SMLNJ\bin
+  - vext install
+  - qmake -r -tp vc
+  - dir
+
+build:
+  project: sonic-visualiser.sln
+  
diff -r d2221cb43cd5 -r 81c92307f0d3 .travis.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.travis.yml	Mon Jul 10 10:10:19 2017 +0100
@@ -0,0 +1,30 @@
+dist:
+  - trusty
+
+language:
+  - cpp
+
+sudo:
+  - false
+
+os:
+  - linux
+  - osx
+
+addons:
+  apt:
+    packages:
+     - libbz2-dev libfftw3-dev libfishsound1-dev libid3tag0-dev liblo-dev liblrdf0-dev libmad0-dev liboggz2-dev libpulse-dev libsamplerate-dev libsndfile-dev libsord-dev libxml2-utils portaudio19-dev qt5-default libqt5svg5-dev raptor-utils librubberband-dev mlton
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew install polyml ; fi
+  - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew install qt5 ; fi
+  - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then export PATH=$PATH:/usr/local/opt/qt5/bin ; fi
+  - ( cd ../ ; git clone https://github.com/sandstorm-io/capnproto )
+  - ( cd ../capnproto/c++ ; ./setup-autotools.sh && autoreconf -i )
+  - ( cd ../capnproto/c++ ; ./configure && make && sudo make install )
+      
+script:
+  - if [[ "$TRAVIS_OS_NAME" = "linux" ]] ; then ./configure ; else ./vext install && qmake -r ; fi
+  - make
+