Merge branch 'sdl2-branch' of github.com:chocolate-doom/chocolate-doom into sdl2-branch

.travis.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+if [ "$ANALYZE" = "true" ] ; then
+	cppcheck --error-exitcode=1 -j2 -UTESTING -Iopl -Isrc -Isrc/setup opl pcsound src textscreen > /dev/null
+else
+	./autogen.sh
+	make
+	make install DESTDIR=/tmp/whatever
+	make dist
+fi

.travis.yml

@@ -7,16 +7,21 @@ compiler: gcc
 sudo: required
 dist: trusty
 
+env:
+    - ANALYZE=false
+    - ANALYZE=true
+
 addons:
     apt:
         packages:
+        - cppcheck
         - libsdl2-dev
         - libsdl2-mixer-dev
         - libsdl2-net-dev
         - libsdl2-image-dev
         - libsamplerate0-dev
 
-script: ./autogen.sh && make && make install DESTDIR=/tmp/whatever && make dist
+script: ./.travis.sh
 
 branches:
     only: