avTranscoder · cchampet · Sep 11, 2014 · Sep 10, 2014
diff --git a/.gitignore b/.gitignore
@@ -12,10 +12,6 @@
 *.la
 *.a
 
-.sconf_temp
-.sconsign.dblite
-config.log
-scons.cfg
 build
 dist
 

diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,6 @@ before_script:
   - date -u
   - uname -a
   - lsb_release -a
-  - ln -s tools/scons.travis.cfg scons.cfg
   - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
   - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
   - sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
@@ -20,8 +19,8 @@ before_script:
   - sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev libxmu-dev doxygen
 
 script:
-  - mkdir build && cd build && cmake ../ && make
-
-after_failure:
-  - cat config.log
+  - mkdir build
+  - cd build
+  - cmake ..
+  - make
 
diff --git a/SConstruct b/SConstruct
diff --git a/app/cpp/SConscript b/app/cpp/SConscript