Sync 2016 06 01

.gitignore

@@ -32,3 +32,9 @@ profile
 !default.mode1v3
 !default.mode2v3
 !default.perspectivev3
+
+# Microsoft Visual Studio
+####################
+*.sdf
+*.opensdf
+*.suo

.travis.yml

@@ -1,16 +1,34 @@
 language: c
-compiler:
-  - gcc
-  - clang
-  - i686-w64-mingw32-gcc
+
+env:
+# These fail because ioquake3 is missing vorbis
+# Re-enable after they add vorbis or OA imports it
+#  - i686-w64-mingw32-gcc
+#  - x86_64-w64-mingw32-gcc
+    # extra libs
+    - CC=gcc USE_CODEC_VORBIS=1 USE_FREETYPE=1
+    - CC=clang USE_CODEC_VORBIS=1 USE_FREETYPE=1
+    # cross-compile using mingw
+#    - CC= PLATFORM="mingw32" ARCH="x86"
+#    - CC= PLATFORM="mingw32" ARCH="x86_64"
 
 script: ./travis-ci-build.sh
 
 before_install:
   - echo "yes" | sudo apt-add-repository ppa:zoogie/sdl2-snapshots
   - sudo apt-get update -qq
   - sudo apt-get remove -qq -y mingw32
-  - sudo apt-get install -q -y libgl1-mesa-dev libsdl2-dev libvorbis-dev libfreetype6-dev mingw-w64
+  - sudo apt-get install -q -y libgl1-mesa-dev libsdl2-dev libfreetype6-dev mingw-w64
 
 notifications:
   email: false
+
+addons:
+  coverity_scan:
+    project:
+      name: "ioquake/ioq3"
+      description: "Build submitted via Travis CI"
+    notification_email: quake3-commits@icculus.org
+    build_command_prepend: "make clean"
+    build_command: "make release"
+    branch_pattern: master