From 9d78d37074d970e17f1a165759d5627ee548ddc0 Mon Sep 17 00:00:00 2001
From: balr0g <balrog032@gmail.com>
Date: Fri, 18 Sep 2015 12:46:29 -0400
Subject: [PATCH 1/4] Travis OS X testing

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

diff --git a/.travis.yml b/.travis.yml
index 8dd5b55a07b..c09810a005e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ language: cpp
 compiler:
   - gcc
   - clang
+os:
+  - linux
+  - osx
 env:
   - SUBTARGET=arcade MAME=mamearcade64 LDOPTS="-Wl,-no-keep-memory"
   - SUBTARGET=mess   MAME=mess64
@@ -12,10 +15,12 @@ script:
     fi
 sudo: required
 before_install:
-  - sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y
-  - sudo add-apt-repository ppa:shahar-evron/qt-backports -y
-  - sudo apt-get update -qq
-  - sudo apt-get install -y --force-yes libsdl2-dev libsdl2-ttf-dev libasound2-dev libqt4-dev libqt4-dev-bin
+  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y; fi"
+  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository ppa:shahar-evron/qt-backports -y; fi"
+  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get update -qq; fi"
+  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get install -y --force-yes libsdl2-dev libsdl2-ttf-dev libasound2-dev libqt4-dev libqt4-dev-bin; fi"
+  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew update; fi"
+  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew install sdl2 sdl2_ttf; fi"
 branches:
   only:
     - master

From bc83da75301466ced651e6adf46f910916bb7006 Mon Sep 17 00:00:00 2001
From: balr0g <balrog032@gmail.com>
Date: Fri, 18 Sep 2015 13:15:07 -0400
Subject: [PATCH 2/4] More Travis OSX changes

---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c09810a005e..7bf8d6bd93d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,21 @@ compiler:
 os:
   - linux
   - osx
+matrix:
+  exclude:
+    - os: osx
+      compiler: gcc
 env:
   - SUBTARGET=arcade MAME=mamearcade64 LDOPTS="-Wl,-no-keep-memory"
   - SUBTARGET=mess   MAME=mess64
 script:
-  - if [ $CC == 'clang' ];
+  - if [ $TRAVIS_OS_NAME == 'linux' ] && [ $CC == 'clang' ];
     then make -j2 linux_x64_clang && ./$MAME -validate;
     else make -j2 OPTIMIZE=0      && ./$MAME -validate;
     fi
+  - if [ $TRAVIS_OS_NAME == 'osx' ];
+    then make -j2 OPTIMIZE=0 MACOSX_USE_LIBSDL=1 && ./$MAME -validate;
+    fi
 sudo: required
 before_install:
   - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y; fi"

From eb050be842b7a985ec2d7aca2e9b2c8c01e3bb69 Mon Sep 17 00:00:00 2001
From: balr0g <balrog032@gmail.com>
Date: Fri, 18 Sep 2015 13:24:54 -0400
Subject: [PATCH 3/4] Corrections

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

diff --git a/.travis.yml b/.travis.yml
index 7bf8d6bd93d..de1f6923c23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,13 @@ env:
   - SUBTARGET=arcade MAME=mamearcade64 LDOPTS="-Wl,-no-keep-memory"
   - SUBTARGET=mess   MAME=mess64
 script:
-  - if [ $TRAVIS_OS_NAME == 'linux' ] && [ $CC == 'clang' ];
-    then make -j2 linux_x64_clang && ./$MAME -validate;
+  - if [ $TRAVIS_OS_NAME == 'linux' ]; then
+    if [ $CC == 'clang' ]; then
+    make -j2 linux_x64_clang && ./$MAME -validate;
     else make -j2 OPTIMIZE=0      && ./$MAME -validate;
     fi
-  - if [ $TRAVIS_OS_NAME == 'osx' ];
-    then make -j2 OPTIMIZE=0 MACOSX_USE_LIBSDL=1 && ./$MAME -validate;
+    elif [ $TRAVIS_OS_NAME == 'osx' ]; then
+    make -j2 OPTIMIZE=0 MACOSX_USE_LIBSDL=1 && ./$MAME -validate;
     fi
 sudo: required
 before_install:

From 98a3482d8b464d15b19c0e4dc3670c04e21534bf Mon Sep 17 00:00:00 2001
From: balr0g <balrog032@gmail.com>
Date: Fri, 18 Sep 2015 14:14:59 -0400
Subject: [PATCH 4/4] One more fix

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

diff --git a/.travis.yml b/.travis.yml
index de1f6923c23..86054759bba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ script:
     else make -j2 OPTIMIZE=0      && ./$MAME -validate;
     fi
     elif [ $TRAVIS_OS_NAME == 'osx' ]; then
-    make -j2 OPTIMIZE=0 MACOSX_USE_LIBSDL=1 && ./$MAME -validate;
+    unset LDOPTS && make -j2 OPTIMIZE=0 MACOSX_USE_LIBSDL=1 && ./$MAME -validate;
     fi
 sudo: required
 before_install: