From dac8da80b9a4af8fca126cd00acc3074c451ea6e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 18:36:16 -0400
Subject: [PATCH 01/44] travis: try out build matrix

---
 .travis.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1996215..8eed6657 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,16 +2,16 @@ language: c
 sudo: required
 dist: trusty
 
-env:
-- CFLAGS=-Wall -W -Werror
-
-os:
-  - linux
-  - osx
-
-compiler:
-  - gcc
-  - clang
+matrix:
+    include:
+        - os: linux
+        env: CC=gcc
+        - os: linux
+        env: CC=clang
+        - os: osx
+        env: CC=gcc
+        - os: osx
+        env: CC=clang
 
 cache:
   apt:  true
@@ -34,6 +34,7 @@ before_script:
   - mkdir build
   - cd build
   - cmake ..
+  - set CFLAGS=-Wall -W -Werror
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

From 06021c3427355ac02e39d7a85d552d7b0ed21521 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 18:38:09 -0400
Subject: [PATCH 02/44] travis: fixup spacing

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8eed6657..c4025a08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,13 @@ dist: trusty
 matrix:
     include:
         - os: linux
-        env: CC=gcc
+          env: CC=gcc
         - os: linux
-        env: CC=clang
+          env: CC=clang
         - os: osx
-        env: CC=gcc
+          env: CC=gcc
         - os: osx
-        env: CC=clang
+          env: CC=clang
 
 cache:
   apt:  true

From 6ff86c2a64c2b1a605b641353ad1dde5943cd708 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 18:44:48 -0400
Subject: [PATCH 03/44] travis: see if compiler works in build matrix

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c4025a08..10157cc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,13 @@ dist: trusty
 matrix:
     include:
         - os: linux
-          env: CC=gcc
+          compiler: gcc
         - os: linux
-          env: CC=clang
+          compiler: clang
         - os: osx
-          env: CC=gcc
+          compiler: gcc
         - os: osx
-          env: CC=clang
+          compiler: clang
 
 cache:
   apt:  true

From b2713cef767ec60b511db0bfef9284248281bf2b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 21:12:46 -0400
Subject: [PATCH 04/44] travis-ci: add all the xcode versions

---
 .travis.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 10157cc1..3d09c7b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,52 @@ matrix:
         - os: linux
           compiler: clang
         - os: osx
+          osx_image: beta-xcode6.1
           compiler: gcc
         - os: osx
+          osx_image: beta-xcode6.1
+          compiler: clang
+        - os: osx
+          osx_image: beta-xcode6.2
+          compiler: gcc
+        - os: osx
+          osx_image: beta-xcode6.2
+          compiler: clang
+        - os: osx
+          osx_image: beta-xcode6.3
+          compiler: gcc
+        - os: osx
+          osx_image: beta-xcode6.3
+          compiler: clang
+        - os: osx
+          osx_image: xcode6.4
+          compiler: gcc
+        - os: osx
+          osx_image: xcode6.4
+          compiler: clang
+        - os: osx
+          osx_image: xcode7
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7
+          compiler: clang
+        - os: osx
+          osx_image: xcode7.1
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7.1
+          compiler: clang
+        - os: osx
+          osx_image: xcode7.2
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7.2
+          compiler: clang
+        - os: osx
+          osx_image: xcode7.3
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7.3
           compiler: clang
 
 cache:

From 80985e9d852d32e056ac4aa6db34192ac6f2fc43 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 22:24:02 -0400
Subject: [PATCH 05/44] travis: build iwth all the gcc packages?

---
 .travis.yml | 123 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 80 insertions(+), 43 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3d09c7b6..291d2fc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,42 @@ matrix:
     include:
         - os: linux
           compiler: gcc
+        - os: linux
+          compiler: gcc
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-4.8
+              env: CC=gcc-4.8
+        - os: linux
+          compiler: gcc
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-4.9
+              env: CC=gcc-4.9
+        - os: linux
+          compiler: gcc
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-5
+              env: CC=gcc-5
+        - os: linux
+          compiler: gcc
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-6
+              env: CC=gcc-6
         - os: linux
           compiler: clang
         - os: osx
@@ -14,48 +50,48 @@ matrix:
         - os: osx
           osx_image: beta-xcode6.1
           compiler: clang
-        - os: osx
-          osx_image: beta-xcode6.2
-          compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.2
-          compiler: clang
-        - os: osx
-          osx_image: beta-xcode6.3
-          compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.3
-          compiler: clang
-        - os: osx
-          osx_image: xcode6.4
-          compiler: gcc
-        - os: osx
-          osx_image: xcode6.4
-          compiler: clang
-        - os: osx
-          osx_image: xcode7
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7
-          compiler: clang
-        - os: osx
-          osx_image: xcode7.1
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7.1
-          compiler: clang
-        - os: osx
-          osx_image: xcode7.2
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7.2
-          compiler: clang
-        - os: osx
-          osx_image: xcode7.3
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7.3
-          compiler: clang
+#        - os: osx
+#          osx_image: beta-xcode6.2
+#          compiler: gcc
+#       - os: osx
+#         osx_image: beta-xcode6.2
+#         compiler: clang#
+#       - os: osx
+#         osx_image: beta-xcode6.3
+#         compiler: gcc
+#       - os: osx
+#         osx_image: beta-xcode6.3
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode6.4
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode6.4
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7.1
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7.1
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7.2
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7.2
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7.3
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7.3
+#         compiler: clang
 
 cache:
   apt:  true
@@ -73,6 +109,7 @@ addons:
     - p7zip-full
 
 before_script:
+  - $CC --version
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build
@@ -82,7 +119,7 @@ before_script:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2_mixer game-music-emu p7zip ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2_mixer game-music-emu p7zip cmake; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/release/SDL2-2.0.4.dmg; hdiutil attach SDL2-2.0.4.dmg; sudo cp -a /Volumes/SDL2/SDL2.framework /Library/Frameworks/; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.dmg; hdiutil attach SDL2_mixer-2.0.1.dmg; sudo cp -a /Volumes/SDL2_mixer/SDL2_mixer.framework /Library/Frameworks/; fi
   - mkdir -p $HOME/srb2_cache

From 3efdb9907c0496b3c6a637efed9d46d7ec98b399 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 22:46:09 -0400
Subject: [PATCH 06/44] travis-ci: add packages in all gcc builds

---
 .travis.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 291d2fc3..02d9eaea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,11 @@ matrix:
               packages:
               - gcc-4.8
               env: CC=gcc-4.8
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
         - os: linux
           compiler: gcc
           addons:
@@ -24,6 +29,11 @@ matrix:
               packages:
               - gcc-4.9
               env: CC=gcc-4.9
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
         - os: linux
           compiler: gcc
           addons:
@@ -33,6 +43,11 @@ matrix:
               packages:
               - gcc-5
               env: CC=gcc-5
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
         - os: linux
           compiler: gcc
           addons:
@@ -41,6 +56,11 @@ matrix:
               - ubuntu-toolchain-r-test
               packages:
               - gcc-6
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
               env: CC=gcc-6
         - os: linux
           compiler: clang

From f4bde57789d9d5f14075933732678e75aa5e44e1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 22:47:35 -0400
Subject: [PATCH 07/44] travis-ci: copy and paste issue

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02d9eaea..99df739d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,12 @@ matrix:
               - ubuntu-toolchain-r-test
               packages:
               - gcc-4.8
-              env: CC=gcc-4.8
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              env: CC=gcc-4.8
         - os: linux
           compiler: gcc
           addons:
@@ -28,12 +28,12 @@ matrix:
               - ubuntu-toolchain-r-test
               packages:
               - gcc-4.9
-              env: CC=gcc-4.9
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              env: CC=gcc-4.9
         - os: linux
           compiler: gcc
           addons:
@@ -42,12 +42,12 @@ matrix:
               - ubuntu-toolchain-r-test
               packages:
               - gcc-5
-              env: CC=gcc-5
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              env: CC=gcc-5
         - os: linux
           compiler: gcc
           addons:
@@ -72,7 +72,7 @@ matrix:
           compiler: clang
 #        - os: osx
 #          osx_image: beta-xcode6.2
-#          compiler: gcc
+#          compiler: gcc    
 #       - os: osx
 #         osx_image: beta-xcode6.2
 #         compiler: clang#

From e3c6ee14a89382f874f3e9977d0b3d9d3a9b529d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 22:54:25 -0400
Subject: [PATCH 08/44] travis-ci: fixup  env setting

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 99df739d..2ac26011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-              env: CC=gcc-4.8
+          env: CC=gcc-4.8
         - os: linux
           compiler: gcc
           addons:
@@ -33,7 +33,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-              env: CC=gcc-4.9
+          env: CC=gcc-4.9
         - os: linux
           compiler: gcc
           addons:
@@ -47,7 +47,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-              env: CC=gcc-5
+          env: CC=gcc-5
         - os: linux
           compiler: gcc
           addons:
@@ -61,7 +61,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-              env: CC=gcc-6
+          env: CC=gcc-6
         - os: linux
           compiler: clang
         - os: osx

From 590a749deda49e7372ba115a490e1042f3984573 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 23:06:59 -0400
Subject: [PATCH 09/44] travis-ci: can not use $CC, let use $GCC

---
 .travis.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ac26011..0955f483 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: CC=gcc-4.8
+          env: GCC=gcc-4.8
         - os: linux
           compiler: gcc
           addons:
@@ -33,7 +33,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: CC=gcc-4.9
+          env: GCC=gcc-4.9
         - os: linux
           compiler: gcc
           addons:
@@ -47,7 +47,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: CC=gcc-5
+          env: GCC=gcc-5
         - os: linux
           compiler: gcc
           addons:
@@ -61,15 +61,15 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: CC=gcc-6
+          env: GCC=gcc-6
         - os: linux
           compiler: clang
-        - os: osx
-          osx_image: beta-xcode6.1
-          compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.1
-          compiler: clang
+#        - os: osx
+#          osx_image: beta-xcode6.1
+#          compiler: gcc
+#        - os: osx
+#          osx_image: beta-xcode6.1
+#          compiler: clang
 #        - os: osx
 #          osx_image: beta-xcode6.2
 #          compiler: gcc    
@@ -114,7 +114,7 @@ matrix:
 #         compiler: clang
 
 cache:
-  apt:  true
+  apt: true
   ccache: true
   directories:
   - $HOME/srb2_cache
@@ -129,6 +129,7 @@ addons:
     - p7zip-full
 
 before_script:
+  - set CC=$GCC
   - $CC --version
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets

From 30d02affa485373dca15590a30bc6839f686e821 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 23:18:52 -0400
Subject: [PATCH 10/44] travis-ci: let use export, not set

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0955f483..b3e39988 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,7 @@ addons:
     - p7zip-full
 
 before_script:
-  - set CC=$GCC
+  - export CC=$GCC
   - $CC --version
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets

From 42dffcb6f3d54012cdc7d9722939b7763482e910 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 27 May 2016 23:40:23 -0400
Subject: [PATCH 11/44] travis-ci: test for _CC

---
 .travis.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b3e39988..7448702b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: GCC=gcc-4.8
+          env: _CC=gcc-4.8
         - os: linux
           compiler: gcc
           addons:
@@ -33,7 +33,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: GCC=gcc-4.9
+          env: _CC=gcc-4.9
         - os: linux
           compiler: gcc
           addons:
@@ -47,7 +47,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: GCC=gcc-5
+          env: _CC=gcc-5
         - os: linux
           compiler: gcc
           addons:
@@ -61,7 +61,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: GCC=gcc-6
+          env: _CC=gcc-6
         - os: linux
           compiler: clang
 #        - os: osx
@@ -129,8 +129,7 @@ addons:
     - p7zip-full
 
 before_script:
-  - export CC=$GCC
-  - $CC --version
+  - $_CC --version&&export CC=$_CC
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build

From 327840092085fc91a3a4e50f659a7cbfc2583a11 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 00:01:22 -0400
Subject: [PATCH 12/44] travis-ci: add test for $_CC

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7448702b..3a6f166c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,7 @@ addons:
     - p7zip-full
 
 before_script:
-  - $_CC --version&&export CC=$_CC
+  -if $_CC --version 2>/dev/null; then export CC=$_CC; fi
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build

From 64e03c0f93698fb7b294e911cb134fa5a16ec17c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 00:23:27 -0400
Subject: [PATCH 13/44] travis-ci: clean up test

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3a6f166c..781a5b1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,7 @@ addons:
     - p7zip-full
 
 before_script:
-  -if $_CC --version 2>/dev/null; then export CC=$_CC; fi
+  -if $_CC --version 2>/dev/null; then export CC=$_CC; fi;
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build

From 439883b8c959c0f765759937a48fced176633408 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 00:33:44 -0400
Subject: [PATCH 14/44] travis-ci: spacing

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 781a5b1d..3d583004 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,7 @@ addons:
     - p7zip-full
 
 before_script:
-  -if $_CC --version 2>/dev/null; then export CC=$_CC; fi;
+  - if $_CC --version 2>/dev/null; then export CC=$_CC; fi;
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build

From ffc92489bbd969cba666be44408cdff8f6ae92bb Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 00:53:14 -0400
Subject: [PATCH 15/44] travia-ci: compile all xcode

---
 .travis.yml | 96 ++++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3d583004..d3c48b36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,54 +64,54 @@ matrix:
           env: _CC=gcc-6
         - os: linux
           compiler: clang
-#        - os: osx
-#          osx_image: beta-xcode6.1
-#          compiler: gcc
-#        - os: osx
-#          osx_image: beta-xcode6.1
-#          compiler: clang
-#        - os: osx
-#          osx_image: beta-xcode6.2
-#          compiler: gcc    
-#       - os: osx
-#         osx_image: beta-xcode6.2
-#         compiler: clang#
-#       - os: osx
-#         osx_image: beta-xcode6.3
-#         compiler: gcc
-#       - os: osx
-#         osx_image: beta-xcode6.3
-#         compiler: clang
-#       - os: osx
-#         osx_image: xcode6.4
-#         compiler: gcc
-#       - os: osx
-#         osx_image: xcode6.4
-#         compiler: clang
-#       - os: osx
-#         osx_image: xcode7
-#         compiler: gcc
-#       - os: osx
-#         osx_image: xcode7
-#         compiler: clang
-#       - os: osx
-#         osx_image: xcode7.1
-#         compiler: gcc
-#       - os: osx
-#         osx_image: xcode7.1
-#         compiler: clang
-#       - os: osx
-#         osx_image: xcode7.2
-#         compiler: gcc
-#       - os: osx
-#         osx_image: xcode7.2
-#         compiler: clang
-#       - os: osx
-#         osx_image: xcode7.3
-#         compiler: gcc
-#       - os: osx
-#         osx_image: xcode7.3
-#         compiler: clang
+        - os: osx
+          osx_image: beta-xcode6.1
+          compiler: gcc
+        - os: osx
+          osx_image: beta-xcode6.1
+          compiler: clang
+        - os: osx
+          osx_image: beta-xcode6.2
+          compiler: gcc    
+       - os: osx
+         osx_image: beta-xcode6.2
+         compiler: clang#
+       - os: osx
+         osx_image: beta-xcode6.3
+         compiler: gcc
+       - os: osx
+         osx_image: beta-xcode6.3
+         compiler: clang
+      - os: osx
+         osx_image: xcode6.4
+         compiler: gcc
+       - os: osx
+         osx_image: xcode6.4
+         compiler: clang
+       - os: osx
+         osx_image: xcode7
+         compiler: gcc
+       - os: osx
+         osx_image: xcode7
+         compiler: clang
+       - os: osx
+         osx_image: xcode7.1
+         compiler: gcc
+       - os: osx
+         osx_image: xcode7.1
+         compiler: clang
+       - os: osx
+         osx_image: xcode7.2
+         compiler: gcc
+       - os: osx
+         osx_image: xcode7.2
+         compiler: clang
+       - os: osx
+         osx_image: xcode7.3
+         compiler: gcc
+      - os: osx
+        osx_image: xcode7.3
+         compiler: clang
 
 cache:
   apt: true

From 9d3f2890c3abc72e48e34013a4f7c6b9b91da00c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 01:12:24 -0400
Subject: [PATCH 16/44] travis-ci fixup space

---
 .travis.yml | 78 ++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d3c48b36..10e11b80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,45 +73,45 @@ matrix:
         - os: osx
           osx_image: beta-xcode6.2
           compiler: gcc    
-       - os: osx
-         osx_image: beta-xcode6.2
-         compiler: clang#
-       - os: osx
-         osx_image: beta-xcode6.3
-         compiler: gcc
-       - os: osx
-         osx_image: beta-xcode6.3
-         compiler: clang
-      - os: osx
-         osx_image: xcode6.4
-         compiler: gcc
-       - os: osx
-         osx_image: xcode6.4
-         compiler: clang
-       - os: osx
-         osx_image: xcode7
-         compiler: gcc
-       - os: osx
-         osx_image: xcode7
-         compiler: clang
-       - os: osx
-         osx_image: xcode7.1
-         compiler: gcc
-       - os: osx
-         osx_image: xcode7.1
-         compiler: clang
-       - os: osx
-         osx_image: xcode7.2
-         compiler: gcc
-       - os: osx
-         osx_image: xcode7.2
-         compiler: clang
-       - os: osx
-         osx_image: xcode7.3
-         compiler: gcc
-      - os: osx
-        osx_image: xcode7.3
-         compiler: clang
+        - os: osx
+          osx_image: beta-xcode6.2
+          compiler: clang#
+        - os: osx
+          osx_image: beta-xcode6.3
+          compiler: gcc
+        - os: osx
+          osx_image: beta-xcode6.3
+          compiler: clang
+        - os: osx
+          osx_image: xcode6.4
+          compiler: gcc
+        - os: osx
+          osx_image: xcode6.4
+          compiler: clang
+        - os: osx
+          osx_image: xcode7
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7
+          compiler: clang
+        - os: osx
+          osx_image: xcode7.1
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7.1
+          compiler: clang
+        - os: osx
+          osx_image: xcode7.2
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7.2
+          compiler: clang
+        - os: osx
+          osx_image: xcode7.3
+          compiler: gcc
+        - os: osx
+          osx_image: xcode7.3
+          compiler: clang
 
 cache:
   apt: true

From 94485edcbb9ba003bce834eee40b282e1a19413a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 02:53:42 -0400
Subject: [PATCH 17/44] travis:-ci: install cmake on some OSX systems

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 10e11b80..a1ce2587 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -139,7 +139,8 @@ before_script:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2_mixer game-music-emu p7zip cmake; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2_mixer game-music-emu p7zip; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated cmake||brew install cmake; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/release/SDL2-2.0.4.dmg; hdiutil attach SDL2-2.0.4.dmg; sudo cp -a /Volumes/SDL2/SDL2.framework /Library/Frameworks/; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.dmg; hdiutil attach SDL2_mixer-2.0.1.dmg; sudo cp -a /Volumes/SDL2_mixer/SDL2_mixer.framework /Library/Frameworks/; fi
   - mkdir -p $HOME/srb2_cache

From e7b15d5f95bf4aa313d3dd54b1d4b562a2bde203 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 03:22:59 -0400
Subject: [PATCH 18/44] travis-cl: fixup osx?

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a1ce2587..fd701396 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -140,7 +140,7 @@ before_script:
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2_mixer game-music-emu p7zip; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated cmake||brew install cmake; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cmake||true; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/release/SDL2-2.0.4.dmg; hdiutil attach SDL2-2.0.4.dmg; sudo cp -a /Volumes/SDL2/SDL2.framework /Library/Frameworks/; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.dmg; hdiutil attach SDL2_mixer-2.0.1.dmg; sudo cp -a /Volumes/SDL2_mixer/SDL2_mixer.framework /Library/Frameworks/; fi
   - mkdir -p $HOME/srb2_cache

From 0b1fc30d0ed2687211e3d5e19a86ab85515688fe Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 17:16:29 -0400
Subject: [PATCH 19/44] travis-ci: clang and gcc are the same on osx and
 xcode6.3 does not works

---
 .travis.yml | 58 ++++++++++++++++-------------------------------------
 1 file changed, 17 insertions(+), 41 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd701396..ea7cd456 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ matrix:
     include:
         - os: linux
           compiler: gcc
+          #gcc (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
         - os: linux
-          compiler: gcc
           addons:
             apt:
               sources:
@@ -19,9 +19,9 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: _CC=gcc-4.8
+          compiler: gcc-4.8
+          #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
         - os: linux
-          compiler: gcc
           addons:
             apt:
               sources:
@@ -33,9 +33,9 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: _CC=gcc-4.9
+          compiler: gcc-4.9
+          #gcc-4.9 (Ubuntu 4.9.3-8ubuntu2~14.04) 4.9.3
         - os: linux
-          compiler: gcc
           addons:
             apt:
               sources:
@@ -47,9 +47,9 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: _CC=gcc-5
+          compiler: gcc-5
+          #gcc-5 (Ubuntu 5.3.0-3ubuntu1~14.04) 5.3.0 20151204
         - os: linux
-          compiler: gcc
           addons:
             apt:
               sources:
@@ -61,57 +61,33 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          env: _CC=gcc-6
+          compiler: gcc-7
+          #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang
+          #clang version 3.5.0 (tags/RELEASE_350/final)
         - os: osx
           osx_image: beta-xcode6.1
-          compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.1
-          compiler: clang
+          #Apple LLVM version 6.0 (clang-600.0.54) (based on LLVM 3.5svn)
         - os: osx
           osx_image: beta-xcode6.2
-          compiler: gcc    
-        - os: osx
-          osx_image: beta-xcode6.2
-          compiler: clang#
-        - os: osx
-          osx_image: beta-xcode6.3
           compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.3
-          compiler: clang
+          #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
         - os: osx
           osx_image: xcode6.4
-          compiler: gcc
-        - os: osx
-          osx_image: xcode6.4
-          compiler: clang
+          #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
         - os: osx
           osx_image: xcode7
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7
-          compiler: clang
+          #Apple LLVM version 7.0.0 (clang-700.0.72)
         - os: osx
           osx_image: xcode7.1
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7.1
-          compiler: clang
+          #Apple LLVM version 7.0.0 (clang-700.1.76)
         - os: osx
           osx_image: xcode7.2
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7.2
-          compiler: clang
+          #Apple LLVM version 7.0.2 (clang-700.1.81)
         - os: osx
           osx_image: xcode7.3
-          compiler: gcc
-        - os: osx
-          osx_image: xcode7.3
-          compiler: clang
+          #Apple LLVM version 7.3.0 (clang-703.0.31)
 
 cache:
   apt: true

From 3cf5d1ddecf9025f58d49a42640d21df682066eb Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 17:22:50 -0400
Subject: [PATCH 20/44] travis-ci: fixup gcc-6 build and added xcode6.3

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ea7cd456..8918713a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ matrix:
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
-          compiler: gcc-7
+          compiler: gcc-6
           #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang
@@ -73,6 +73,9 @@ matrix:
           osx_image: beta-xcode6.2
           compiler: gcc
           #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
+        - os: osx
+          osx_image: beta-xcode6.3
+          #
         - os: osx
           osx_image: xcode6.4
           #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)

From 90ae2b2d1d5301e20b9869b7bb777095a1a19365 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 17:44:38 -0400
Subject: [PATCH 21/44] cmake: compile with warnings

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8918713a..7f46c307 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,8 +113,8 @@ before_script:
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build
   - cd build
-  - cmake ..
-  - set CFLAGS=-Wall -W -Werror
+  - export CFLAGS=-Wall -W -Werror
+  - cmake .. -DCMAKE_BUILD_TYPE=Release
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

From c76c5152c2928d4a0d4ce663c2a3b2cfd79b7f6c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 17:59:19 -0400
Subject: [PATCH 22/44] travis-ci: fixup CFLAGS env and disable xcode6.3, it is
 really broken

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f46c307..5b414f97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,9 +73,9 @@ matrix:
           osx_image: beta-xcode6.2
           compiler: gcc
           #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
-        - os: osx
-          osx_image: beta-xcode6.3
-          #
+#        - os: osx
+#          osx_image: beta-xcode6.3
+#          #
         - os: osx
           osx_image: xcode6.4
           #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
@@ -108,12 +108,11 @@ addons:
     - p7zip-full
 
 before_script:
-  - if $_CC --version 2>/dev/null; then export CC=$_CC; fi;
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build
   - cd build
-  - export CFLAGS=-Wall -W -Werror
+  - export CFLAGS="-Wall -W -Werror"
   - cmake .. -DCMAKE_BUILD_TYPE=Release
 
 before_install:

From f4a84c916e6639bf28915e1e7cea7bb14472a3ec Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 18:39:15 -0400
Subject: [PATCH 23/44] travis: Fixedup gcc 5 error and allow gcc 6 to fail

---
 .travis.yml      | 8 +++++---
 src/sdl/i_main.c | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b414f97..eabc52f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ sudo: required
 dist: trusty
 
 matrix:
+    allow_failures:
+        compiler: gcc-6
     include:
         - os: linux
           compiler: gcc
@@ -73,9 +75,9 @@ matrix:
           osx_image: beta-xcode6.2
           compiler: gcc
           #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
-#        - os: osx
-#          osx_image: beta-xcode6.3
-#          #
+        - os: osx
+          osx_image: beta-xcode6.3
+          #
         - os: osx
           osx_image: xcode6.4
           #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 74b61339..a12ff637 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -245,7 +245,7 @@ int main(int argc, char **argv)
 #endif
 
 	// return to OS
-#ifndef __GNUC__
+#if !defined (__GNUC__) || (__GNUC__ < 5)
 	return 0;
 #endif
 }

From ad6c2e634f6ddb9b8a24e4fca0817e347ae0543e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 19:08:50 -0400
Subject: [PATCH 24/44] travis: disable xcode6.3

---
 .travis.yml      | 8 ++++----
 src/sdl/i_main.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eabc52f4..6376ed52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,10 +75,10 @@ matrix:
           osx_image: beta-xcode6.2
           compiler: gcc
           #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
-        - os: osx
-          osx_image: beta-xcode6.3
-          #
-        - os: osx
+#        - os: osx
+#          osx_image: beta-xcode6.3
+#          #
+#        - os: osx
           osx_image: xcode6.4
           #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
         - os: osx
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index a12ff637..6ccea92a 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -245,7 +245,7 @@ int main(int argc, char **argv)
 #endif
 
 	// return to OS
-#if !defined (__GNUC__) || (__GNUC__ < 5)
+#if !defined (__GNUC__) || (__GNUC__ < 4)
 	return 0;
 #endif
 }

From 02e67a4a950be49f7abdc3daed60100164827ec0 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 19:15:37 -0400
Subject: [PATCH 25/44] travis: add gcc 4.4, 4.6 and 4.7

---
 .travis.yml      | 36 ++++++++++++++++++++++++++++++++++++
 src/sdl/i_main.c |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6376ed52..1e4caa7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,42 @@ matrix:
     allow_failures:
         compiler: gcc-6
     include:
+        - os: linux
+          addons:
+            apt:
+              packages:
+              - gcc-4.4
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+          compiler: gcc-4.4
+          #gcc-4.4
+        - os: linux
+          addons:
+            apt:
+              packages:
+              - gcc-4.6
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+          compiler: gcc-4.6
+          #gcc-4.6
+        - os: linux
+          addons:
+            apt:
+              packages:
+              - gcc-4.7
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+          compiler: gcc-4.7
+          #gcc-4.7
         - os: linux
           compiler: gcc
           #gcc (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 6ccea92a..e06c4ae9 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -245,7 +245,7 @@ int main(int argc, char **argv)
 #endif
 
 	// return to OS
-#if !defined (__GNUC__) || (__GNUC__ < 4)
+#if !defined (__GNUC__) || (__GNUC__ < 3)
 	return 0;
 #endif
 }

From a1d246a34e7d5b9b89a032f577ee89e1762a1d9b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 19:17:21 -0400
Subject: [PATCH 26/44] travis-cl: disable gcc-6 build

---
 .travis.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e4caa7b..2c7eb93e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,20 +87,20 @@ matrix:
               - p7zip-full
           compiler: gcc-5
           #gcc-5 (Ubuntu 5.3.0-3ubuntu1~14.04) 5.3.0 20151204
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - ubuntu-toolchain-r-test
-              packages:
-              - gcc-6
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - p7zip-full
-          compiler: gcc-6
-          #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
+#        - os: linux
+#          addons:
+#            apt:
+#              sources:
+#              - ubuntu-toolchain-r-test
+#              packages:
+#              - gcc-6
+#              - libsdl2-mixer-dev
+#              - libpng-dev
+#              - libgl1-mesa-dev
+#              - libgme-dev
+#              - p7zip-full
+#          compiler: gcc-6
+#          #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang
           #clang version 3.5.0 (tags/RELEASE_350/final)

From 35f36e1bba7c0af75c0338ca176ffa5b388d6b66 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 19:28:37 -0400
Subject: [PATCH 27/44] travis-ci: set v of nulK to 0

---
 src/blua/lcode.c | 1 +
 src/sdl/i_main.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/blua/lcode.c b/src/blua/lcode.c
index 743a094a..5c7fed45 100644
--- a/src/blua/lcode.c
+++ b/src/blua/lcode.c
@@ -270,6 +270,7 @@ static int boolK (FuncState *fs, int b) {
 
 static int nilK (FuncState *fs) {
   TValue k, v;
+  setbvalue(&v, 0);
   setnilvalue(&v);
   /* cannot use nil as key; instead use table itself to represent nil */
   sethvalue(fs->L, &k, fs->h);
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index e06c4ae9..2364281d 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -245,7 +245,7 @@ int main(int argc, char **argv)
 #endif
 
 	// return to OS
-#if !defined (__GNUC__) || (__GNUC__ < 3)
+#if !defined (__GNUC__)
 	return 0;
 #endif
 }

From d9aa430817fc4bc60c0aae634153cb7fa6872960 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 19:42:38 -0400
Subject: [PATCH 28/44] use memmove in D_MD5PasswordPass() and drop noreturn

---
 src/d_netcmd.c   | 2 +-
 src/sdl/i_main.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 3dd95bf9..1658d1a6 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2601,7 +2601,7 @@ static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt,
 
 	if (len > 256-strlen(salt))
 		len = 256-strlen(salt);
-	memcpy(tmpbuf, buffer, len);
+	memmove(tmpbuf, buffer, len);
 	strcpy(&tmpbuf[len], salt);
 	len += strlen(salt);
 	if (len < 256)
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 2364281d..ab7631bc 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -144,10 +144,8 @@ void XBoxStartup()
 	myargv = NULL;
 #else
 #ifdef FORCESDLMAIN
-FUNCNORETURN
 int SDL_main(int argc, char **argv)
 #else
-FUNCNORETURN
 int main(int argc, char **argv)
 #endif
 {
@@ -245,8 +243,6 @@ int main(int argc, char **argv)
 #endif
 
 	// return to OS
-#if !defined (__GNUC__)
 	return 0;
-#endif
 }
 #endif

From 3aea4a7601cbc2cbf954fb86cf80b2ab30902099 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 19:48:52 -0400
Subject: [PATCH 29/44] replace strcpy with memmove in D_MD5PasswordPass()

---
 src/d_netcmd.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 1658d1a6..868469cf 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2598,11 +2598,13 @@ static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt,
 	memset(dest, 0, 16);
 #else
 	XBOXSTATIC char tmpbuf[256];
+	const size_t sl = strlen(salt)
 
-	if (len > 256-strlen(salt))
-		len = 256-strlen(salt);
-	memmove(tmpbuf, buffer, len);
-	strcpy(&tmpbuf[len], salt);
+	if (len > 256-sl)
+		len = 256-s;;
+	memcpy(tmpbuf, buffer, len);
+	memmove(&tmpbuf[len], salt, sl);
+	//strcpy(&tmpbuf[len], salt);
 	len += strlen(salt);
 	if (len < 256)
 		memset(&tmpbuf[len],0,256-len);

From 35b254feaa18d7fc40943c2fe2d98fbc7742b071 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 19:51:10 -0400
Subject: [PATCH 30/44] D_MD5PasswordPass, fixup

---
 src/d_netcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 868469cf..4f73a256 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2598,10 +2598,10 @@ static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt,
 	memset(dest, 0, 16);
 #else
 	XBOXSTATIC char tmpbuf[256];
-	const size_t sl = strlen(salt)
+	const size_t sl = strlen(salt);
 
 	if (len > 256-sl)
-		len = 256-s;;
+		len = 256-sl;
 	memcpy(tmpbuf, buffer, len);
 	memmove(&tmpbuf[len], salt, sl);
 	//strcpy(&tmpbuf[len], salt);

From 4956be2bd4916e81e5c123117d20c2e9de5b6ac7 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 21:23:09 -0400
Subject: [PATCH 31/44] gcc-6: error: left shift of negative value
 [-Werror=shift-negative-value]

---
 src/i_tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i_tcp.c b/src/i_tcp.c
index 89e59c8b..eca218c8 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -466,7 +466,7 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 	UINT32 bitmask = INADDR_NONE;
 
 	if (mask && mask < 32)
-		bitmask = htonl(-1 << (32 - mask));
+		bitmask = htonl((UINT32)(-1) << (32 - mask));
 
 	if (b->any.sa_family == AF_INET)
 		return (a->ip4.sin_addr.s_addr & bitmask) == (b->ip4.sin_addr.s_addr & bitmask)

From 9e196613a01954febe0d4a2a1b838d2afdad8ec6 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 21:23:46 -0400
Subject: [PATCH 32/44] =?UTF-8?q?gcc-6:=20error:=20this=20=E2=80=98for?=
 =?UTF-8?q?=E2=80=99=20clause=20does=20not=20guard...=20[-Werror=3Dmislead?=
 =?UTF-8?q?ing-indentation]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/m_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index 6d1e8f11..6c129444 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -7430,7 +7430,7 @@ static void M_HandleFogColor(INT32 choice)
 				l = strlen(temp);
 				for (i = 0; i < l; i++)
 					cv_grfogcolor.zstring[5 - i] = temp[l - i];
-					cv_grfogcolor.zstring[5] = (char)choice;
+				cv_grfogcolor.zstring[5] = (char)choice;
 			}
 			break;
 	}

From 209d76cb9dbcba5a6175a49269b1d88bd85a54e4 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 21:24:06 -0400
Subject: [PATCH 33/44] =?UTF-8?q?gcc-6:=20error:=20this=20=E2=80=98if?=
 =?UTF-8?q?=E2=80=99=20clause=20does=20not=20guard...=20[-Werror=3Dmislead?=
 =?UTF-8?q?ing-indentation]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/blua/ltablib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/blua/ltablib.c b/src/blua/ltablib.c
index 2e50ce0a..2dd15715 100644
--- a/src/blua/ltablib.c
+++ b/src/blua/ltablib.c
@@ -137,7 +137,7 @@ static void addfield (lua_State *L, luaL_Buffer *b, int i) {
   if (!lua_isstring(L, -1))
     luaL_error(L, "invalid value (%s) at index %d in table for "
                   LUA_QL("concat"), luaL_typename(L, -1), i);
-    luaL_addvalue(b);
+  luaL_addvalue(b);
 }
 
 

From b60ab05721b56f0a083af37d223e192ebe7be934 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 21:31:33 -0400
Subject: [PATCH 34/44] travis-ci: reenable gcc-6

---
 .travis.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c7eb93e..1e4caa7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,20 +87,20 @@ matrix:
               - p7zip-full
           compiler: gcc-5
           #gcc-5 (Ubuntu 5.3.0-3ubuntu1~14.04) 5.3.0 20151204
-#        - os: linux
-#          addons:
-#            apt:
-#              sources:
-#              - ubuntu-toolchain-r-test
-#              packages:
-#              - gcc-6
-#              - libsdl2-mixer-dev
-#              - libpng-dev
-#              - libgl1-mesa-dev
-#              - libgme-dev
-#              - p7zip-full
-#          compiler: gcc-6
-#          #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
+        - os: linux
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-6
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+          compiler: gcc-6
+          #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang
           #clang version 3.5.0 (tags/RELEASE_350/final)

From e866630b22e152a0d9bdb4902c566d92294e38d1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 21:50:06 -0400
Subject: [PATCH 35/44] travis: disable tautological-compare warnings

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1e4caa7b..9e92ae1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -150,7 +150,8 @@ before_script:
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build
   - cd build
-  - export CFLAGS="-Wall -W -Werror"
+  - export CFLAGS="-Wall -W -Werror -Wno-tautological-compare -Wno-error=tautological-compare"
+  - $CC -Wno-error=tautological-compare -dM -E - < /dev/null&>/dev/null||export CFLAGS="Wall -W -Werror"
   - cmake .. -DCMAKE_BUILD_TYPE=Release
 
 before_install:

From 2dfdc99cb5e620ecf2911191a610007d16a0640e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 22:30:28 -0400
Subject: [PATCH 36/44] travis-ci: let add pre build files, gcc-6 get disable
 warning flags

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e92ae1f..836ac58a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,6 +100,7 @@ matrix:
               - libgme-dev
               - p7zip-full
           compiler: gcc-6
+          env: WFLAGS=-Werror -Wno-tautological-compare -Wno-error=tautological-compare
           #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang
@@ -150,8 +151,7 @@ before_script:
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build
   - cd build
-  - export CFLAGS="-Wall -W -Werror -Wno-tautological-compare -Wno-error=tautological-compare"
-  - $CC -Wno-error=tautological-compare -dM -E - < /dev/null&>/dev/null||export CFLAGS="Wall -W -Werror"
+  - export CFLAGS="-Wall -W $WFLAGS"
   - cmake .. -DCMAKE_BUILD_TYPE=Release
 
 before_install:

From 68329624899d693c7df5ecccf3e7e5fcd6fa7cf5 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 28 May 2016 22:45:47 -0400
Subject: [PATCH 37/44] travis-ci: env vars need to be quoted

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 836ac58a..69e8ee9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,7 +100,7 @@ matrix:
               - libgme-dev
               - p7zip-full
           compiler: gcc-6
-          env: WFLAGS=-Werror -Wno-tautological-compare -Wno-error=tautological-compare
+          env: WFLAGS="-Wno-tautological-compare -Wno-error=tautological-compare"
           #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang

From febaabd80baa41cc0e8970a4e04ed416f03fb88b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 29 May 2016 09:40:56 -0400
Subject: [PATCH 38/44] travis: label up each compiler build, and remove the
 allow_failures

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69e8ee9e..f9f701ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@ sudo: required
 dist: trusty
 
 matrix:
-    allow_failures:
-        compiler: gcc-6
     include:
         - os: linux
           addons:
@@ -17,7 +15,7 @@ matrix:
               - libgme-dev
               - p7zip-full
           compiler: gcc-4.4
-          #gcc-4.4
+          #gcc-4.4 (Ubuntu/Linaro 4.4.7-8ubuntu1) 4.4.7
         - os: linux
           addons:
             apt:
@@ -29,7 +27,7 @@ matrix:
               - libgme-dev
               - p7zip-full
           compiler: gcc-4.6
-          #gcc-4.6
+          #gcc-4.6 (Ubuntu/Linaro 4.6.4-6ubuntu2) 4.6.4
         - os: linux
           addons:
             apt:
@@ -114,7 +112,7 @@ matrix:
           #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
 #        - os: osx
 #          osx_image: beta-xcode6.3
-#          #
+#          #I think xcode.6.3 VM is broken, it does not boot
 #        - os: osx
           osx_image: xcode6.4
           #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)

From 6fb70f8d02ced358f746aa1dda03b12a786df09a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 29 May 2016 09:47:30 -0400
Subject: [PATCH 39/44] travis-ci: let only display, not error on autological
 warnings

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f9f701ef..c6c4313c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,7 +98,7 @@ matrix:
               - libgme-dev
               - p7zip-full
           compiler: gcc-6
-          env: WFLAGS="-Wno-tautological-compare -Wno-error=tautological-compare"
+          env: WFLAGS="-Wno-error=tautological-compare"
           #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang

From 5c5b85f369646d82354a9e8dc916cd18d72d3dd9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 30 May 2016 17:16:58 -0400
Subject: [PATCH 40/44] travis-ci: add builds for clang 3.4 to 3.8

---
 .travis.yml | 66 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6c4313c..54cd25c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,36 +8,36 @@ matrix:
           addons:
             apt:
               packages:
-              - gcc-4.4
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              - gcc-4.4
           compiler: gcc-4.4
           #gcc-4.4 (Ubuntu/Linaro 4.4.7-8ubuntu1) 4.4.7
         - os: linux
           addons:
             apt:
               packages:
-              - gcc-4.6
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              - gcc-4.6
           compiler: gcc-4.6
           #gcc-4.6 (Ubuntu/Linaro 4.6.4-6ubuntu2) 4.6.4
         - os: linux
           addons:
             apt:
               packages:
-              - gcc-4.7
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              - gcc-4.7
           compiler: gcc-4.7
           #gcc-4.7
         - os: linux
@@ -49,12 +49,12 @@ matrix:
               sources:
               - ubuntu-toolchain-r-test
               packages:
-              - gcc-4.8
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              - gcc-4.8
           compiler: gcc-4.8
           #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
         - os: linux
@@ -63,12 +63,12 @@ matrix:
               sources:
               - ubuntu-toolchain-r-test
               packages:
-              - gcc-4.9
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              - gcc-4.9
           compiler: gcc-4.9
           #gcc-4.9 (Ubuntu 4.9.3-8ubuntu2~14.04) 4.9.3
         - os: linux
@@ -77,12 +77,12 @@ matrix:
               sources:
               - ubuntu-toolchain-r-test
               packages:
-              - gcc-5
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              - gcc-5
           compiler: gcc-5
           #gcc-5 (Ubuntu 5.3.0-3ubuntu1~14.04) 5.3.0 20151204
         - os: linux
@@ -91,18 +91,70 @@ matrix:
               sources:
               - ubuntu-toolchain-r-test
               packages:
-              - gcc-6
               - libsdl2-mixer-dev
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
               - p7zip-full
+              - gcc-6
           compiler: gcc-6
           env: WFLAGS="-Wno-error=tautological-compare"
           #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
         - os: linux
           compiler: clang
           #clang version 3.5.0 (tags/RELEASE_350/final)
+        - os: linux
+            apt:
+              sources:
+              - llvm-toolchain-precise-3.5
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+              - clang-3.5
+          compiler: clang
+          #
+        - os: linux
+            apt:
+              sources:
+              - llvm-toolchain-precise-3.6
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+              - clang-3.6
+          compiler: clang
+          #
+        - os: linux
+            apt:
+              sources:
+              - llvm-toolchain-precise-3.7
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+              - clang-3.7
+          compiler: clang
+          #
+        - os: linux
+            apt:
+              sources:
+              - llvm-toolchain-precise-3.8
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+              - clang-3.8
+          compiler: clang
+          #
         - os: osx
           osx_image: beta-xcode6.1
           #Apple LLVM version 6.0 (clang-600.0.54) (based on LLVM 3.5svn)

From 9f5ecdcd9c8b9f47824c9f56a212d0eea629e05c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 30 May 2016 17:19:32 -0400
Subject: [PATCH 41/44] travis: add mssing addons: section

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 54cd25c6..b96f2181 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,6 +104,7 @@ matrix:
           compiler: clang
           #clang version 3.5.0 (tags/RELEASE_350/final)
         - os: linux
+          addons:
             apt:
               sources:
               - llvm-toolchain-precise-3.5
@@ -117,6 +118,7 @@ matrix:
           compiler: clang
           #
         - os: linux
+          addons:
             apt:
               sources:
               - llvm-toolchain-precise-3.6
@@ -130,6 +132,7 @@ matrix:
           compiler: clang
           #
         - os: linux
+          addons:
             apt:
               sources:
               - llvm-toolchain-precise-3.7
@@ -143,6 +146,7 @@ matrix:
           compiler: clang
           #
         - os: linux
+          addons:
             apt:
               sources:
               - llvm-toolchain-precise-3.8

From 5e154ce3fd5a980d4fac923ba6161963124d8dc2 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 30 May 2016 17:21:24 -0400
Subject: [PATCH 42/44] travis: use the correct binary name for clang

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b96f2181..bc694116 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,7 @@ matrix:
               - libgme-dev
               - p7zip-full
               - clang-3.6
-          compiler: clang
+          compiler: clang-3.6
           #
         - os: linux
           addons:
@@ -143,7 +143,7 @@ matrix:
               - libgme-dev
               - p7zip-full
               - clang-3.7
-          compiler: clang
+          compiler: clang-3.7
           #
         - os: linux
           addons:
@@ -157,7 +157,7 @@ matrix:
               - libgme-dev
               - p7zip-full
               - clang-3.8
-          compiler: clang
+          compiler: clang-3.8
           #
         - os: osx
           osx_image: beta-xcode6.1

From 9a703bbeda78b93a87d99ff0745c6e00e01d9aaf Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 30 May 2016 17:41:23 -0400
Subject: [PATCH 43/44] travis-ci: drop clang 3.6, 3.7 and 3.8

---
 .travis.yml | 44 +-------------------------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc694116..6ff3f788 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,49 +115,7 @@ matrix:
               - libgme-dev
               - p7zip-full
               - clang-3.5
-          compiler: clang
-          #
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.6
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - p7zip-full
-              - clang-3.6
-          compiler: clang-3.6
-          #
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.7
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - p7zip-full
-              - clang-3.7
-          compiler: clang-3.7
-          #
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.8
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - p7zip-full
-              - clang-3.8
-          compiler: clang-3.8
+          compiler: clang-3.5
           #
         - os: osx
           osx_image: beta-xcode6.1

From 61faee12bc2e0e9c8d9d0d596e5cf8ab6e2ba8b5 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 30 May 2016 17:52:30 -0400
Subject: [PATCH 44/44] travis-ci: add back clang 3.6 to 3.8, but also have
 toolchain test repos into the mix

---
 .travis.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6ff3f788..a6423b62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -116,6 +116,51 @@ matrix:
               - p7zip-full
               - clang-3.5
           compiler: clang-3.5
+          #Ubuntu clang version 3.5.0-4ubuntu2~trusty2 (tags/RELEASE_350/final) (based on LLVM 3.5.0)
+        - os: linux
+          addons:
+            apt:
+              sources:
+              - llvm-toolchain-precise-3.6
+              - ubuntu-toolchain-r-test
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+              - clang-3.6
+          compiler: clang-3.6
+          #
+        - os: linux
+          addons:
+            apt:
+              sources:
+              - llvm-toolchain-precise-3.7
+              - ubuntu-toolchain-r-test
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+              - clang-3.7
+          compiler: clang-3.7
+          #
+        - os: linux
+          addons:
+            apt:
+              sources:
+              - llvm-toolchain-precise-3.8
+              - ubuntu-toolchain-r-test
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - p7zip-full
+              - clang-3.8
+          compiler: clang-3.8
           #
         - os: osx
           osx_image: beta-xcode6.1