From f53f049a648f1ffbc61558e2369080dc2ead06db Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 1 Jul 2020 17:42:18 +0200
Subject: [PATCH 1/8] give MacOS 10.15 a spin

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

diff --git a/.travis.yml b/.travis.yml
index d877e8acc..5fec5a830 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,9 @@ addons:
     build_command: "make VERBOSE=1 -j3"
 matrix:
   include:
-    - name: OpenMW (all) on macOS Xcode 10.2
+    - name: OpenMW (all) on MacOS 10.15 with Xcode 12
       os: osx
-      osx_image: xcode10.2
+      osx_image: xcode12
       if: branch != coverity_scan
     - name: OpenMW (all) on Ubuntu Focal with GCC
       os: linux

From 3eeee4bc9477451c0ec01377b3d96e73c59e17ef Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 1 Jul 2020 17:52:34 +0200
Subject: [PATCH 2/8] drop need to upgrade qt, 5.15 is by default installed;
 add CXX_FLAGS; retarget SYSROOT to 10.15

---
 CI/before_install.osx.sh | 1 -
 CI/before_script.osx.sh  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index e279d1933..0f69ecb39 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -2,7 +2,6 @@
 
 brew update
 brew outdated pkgconfig || brew upgrade pkgconfig
-brew install qt
 brew install ccache
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 01d9d2b80..c71dc3d6f 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -13,8 +13,9 @@ cmake \
 -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \
 -D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
 -D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
+-D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
--D CMAKE_OSX_SYSROOT="macosx10.14" \
+-D CMAKE_OSX_SYSROOT="macosx10.15" \
 -D CMAKE_BUILD_TYPE=Release \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_ESMTOOL=FALSE \

From a62e3a7b35c46c4177625a20c392605a08fca536 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 1 Jul 2020 18:50:41 +0200
Subject: [PATCH 3/8] What happens when I remove the sysroot line?

---
 CI/before_script.osx.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index c71dc3d6f..8bcfe99ce 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -15,7 +15,6 @@ cmake \
 -D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
 -D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
--D CMAKE_OSX_SYSROOT="macosx10.15" \
 -D CMAKE_BUILD_TYPE=Release \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_ESMTOOL=FALSE \

From 1e23d007dd8b16905d5efb1bd4d2c15480deadbb Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 1 Jul 2020 22:23:02 +0200
Subject: [PATCH 4/8] Use Debug instead of Release to increase build time
 (passing -O0)

---
 CI/before_script.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 8bcfe99ce..7ba21b23b 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -15,7 +15,7 @@ cmake \
 -D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
 -D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
--D CMAKE_BUILD_TYPE=Release \
+-D CMAKE_BUILD_TYPE=DEBUG \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_ESMTOOL=FALSE \
 -G"Unix Makefiles" \

From 3ea576efdc014e89258b77d3d1037f8f18297f51 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 3 Jul 2020 23:24:54 +0200
Subject: [PATCH 5/8] do not build a few things; temporary disable checking
 package; get things compiling and cached first

---
 .travis.yml              | 2 +-
 CI/before_install.osx.sh | 2 --
 CI/before_script.osx.sh  | 3 +++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5fec5a830..cfc449434 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,7 +72,7 @@ script:
  - cd ./build
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ${ANALYZE} make -j3; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
- - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi
+# - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
  - cd "${TRAVIS_BUILD_DIR}"
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 0f69ecb39..5dae1f102 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-brew update
-brew outdated pkgconfig || brew upgrade pkgconfig
 brew install ccache
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 7ba21b23b..7438c6c7a 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -18,5 +18,8 @@ cmake \
 -D CMAKE_BUILD_TYPE=DEBUG \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_ESMTOOL=FALSE \
+-D BUILD_BSATOOL=FALSE \
+-D BUILD_ESSIMPORTER=FALSE \
+-D BUILD_NIFTEST=FALSE \
 -G"Unix Makefiles" \
 ..

From db75398fba426a9a535a0a37f3dddb415c9826ca Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 4 Jul 2020 11:54:19 +0200
Subject: [PATCH 6/8] only build openmw for now

---
 CI/before_script.osx.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 7438c6c7a..9697c757c 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -17,6 +17,8 @@ cmake \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
 -D CMAKE_BUILD_TYPE=DEBUG \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
+-D BUILD_OPENMW=TRUE \
+-D BUILD_OPENCS=FALSE \
 -D BUILD_ESMTOOL=FALSE \
 -D BUILD_BSATOOL=FALSE \
 -D BUILD_ESSIMPORTER=FALSE \

From 2ac4a2c6e364cbc746ba950a9653ac871058ff95 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 4 Jul 2020 13:22:58 +0200
Subject: [PATCH 7/8] do not make package for now

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

diff --git a/.travis.yml b/.travis.yml
index cfc449434..cd0e6e713 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,7 +71,7 @@ before_script:
 script:
  - cd ./build
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ${ANALYZE} make -j3; fi
- - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
+# - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
 # - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../CI/check_package.osx.sh; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi

From 14d5b3eeaf65f1ac259c538a703be0e9e175c07e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Mon, 6 Jul 2020 07:47:31 +0200
Subject: [PATCH 8/8] try release again and turning on bit by bit for ccache to
 be used

---
 CI/before_script.osx.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 9697c757c..15d6862db 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -14,14 +14,16 @@ cmake \
 -D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
 -D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
 -D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" \
+-D CMAKE_C_FLAGS_RELEASE="-g -O0" \
+-D CMAKE_CXX_FLAGS_RELEASE="-g -O0" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
--D CMAKE_BUILD_TYPE=DEBUG \
+-D CMAKE_BUILD_TYPE=RELEASE \
 -D OPENMW_OSX_DEPLOYMENT=TRUE \
 -D BUILD_OPENMW=TRUE \
 -D BUILD_OPENCS=FALSE \
--D BUILD_ESMTOOL=FALSE \
--D BUILD_BSATOOL=FALSE \
--D BUILD_ESSIMPORTER=FALSE \
--D BUILD_NIFTEST=FALSE \
+-D BUILD_ESMTOOL=TRUE \
+-D BUILD_BSATOOL=TRUE \
+-D BUILD_ESSIMPORTER=TRUE \
+-D BUILD_NIFTEST=TRUE \
 -G"Unix Makefiles" \
 ..