diff --git a/.travis.yml b/.travis.yml index d877e8accb..cd0e6e713c 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 @@ -71,8 +71,8 @@ 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 ../CI/check_package.osx.sh; 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 - cd "${TRAVIS_BUILD_DIR}" diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index e279d1933b..5dae1f1021 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,8 +1,5 @@ #!/bin/sh -e -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 01d9d2b80a..15d6862db6 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -13,10 +13,17 @@ 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_C_FLAGS_RELEASE="-g -O0" \ +-D CMAKE_CXX_FLAGS_RELEASE="-g -O0" \ -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \ --D CMAKE_OSX_SYSROOT="macosx10.14" \ --D CMAKE_BUILD_TYPE=Release \ +-D CMAKE_BUILD_TYPE=RELEASE \ -D OPENMW_OSX_DEPLOYMENT=TRUE \ --D BUILD_ESMTOOL=FALSE \ +-D BUILD_OPENMW=TRUE \ +-D BUILD_OPENCS=FALSE \ +-D BUILD_ESMTOOL=TRUE \ +-D BUILD_BSATOOL=TRUE \ +-D BUILD_ESSIMPORTER=TRUE \ +-D BUILD_NIFTEST=TRUE \ -G"Unix Makefiles" \ ..