From 0dbd7e03d22e4a878b35cd582517f2fbe583c434 Mon Sep 17 00:00:00 2001
From: Luke Ceddia <flukiluke@gmail.com>
Date: Thu, 11 Jan 2018 21:14:15 +1100
Subject: [PATCH] osx travis build tweaks

---
 .travis.yml          |  4 ++--
 .travis/build-osx.sh | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95d6d0a80..dcafe97bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,10 @@ after_success: ".travis/push.sh"
 
 matrix:
     include:
-        - os: linux
-          compiler: gcc
         - os: osx
           compiler: clang
+        - os: linux
+          compiler: gcc
 
 env:
   global:
diff --git a/.travis/build-osx.sh b/.travis/build-osx.sh
index 90f0b7536..ae212ff47 100755
--- a/.travis/build-osx.sh
+++ b/.travis/build-osx.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+g++ --version
+
 ###### Part 1: Build old QB64 ######
 echo "Preparing bootstrap:"
 find . -type f -iname "*.command" -exec chmod +x {} \;
@@ -10,7 +12,7 @@ rm internal/temp/* 2> /dev/null
 
 com_build() {
   cd internal/c/$1/os/osx
-  echo -n "Building $2..."
+  echo "Building $2..."
   ./setup_build.command
   if [ $? -ne 0 ]; then
     echo "$2 build failed."
@@ -25,7 +27,7 @@ com_build "parts/video/font/ttf" "FreeType"
  
 cp -r internal/source/* internal/temp/
 cd internal/c
-echo -n "Bootstrapping QB64..."
+echo "Bootstrapping QB64..."
 g++ -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -o ../../qb64_bootstrap
 if [ $? -ne 0 ]; then
   echo "QB64 bootstrap failed"
@@ -35,7 +37,7 @@ echo "Done"
 cd - > /dev/null
 
 ###### Part 2: Build new QB64 from .bas sources ######
-echo -n "Translating .bas source..."
+echo "Translating .bas source..."
 echo AutoBuildMsg\$ = CHR\$\(10\) + \"From git `echo $TRAVIS_COMMIT | sed 's/\(.......\).*$/\1/'`\" >> source/global/version.bas
 ./qb64_bootstrap -x -z source/qb64.bas > /tmp/qb64-output
 rm qb64_bootstrap
@@ -46,10 +48,10 @@ if [ `wc -l /tmp/qb64-output |awk '{print $1}'` -gt 2 ]; then
 fi
 echo "Done"
 
-echo -n "Testing compile/link..."
+echo "Testing compile/link..."
 # extract g++ line
 cd internal/temp/
-cpp_call=`awk '$1=="g++" {print $0}' < recompile_lnx.sh`
+cpp_call=`awk '$1=="g++" {print $0}' < recompile_osx.command`
 
 # run g++
 cd ../c/