diff --git a/.travis.yml b/.travis.yml index 0c2e722b..080c1cbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ dist: bionic cache: directories: - vst/download/ - # macOS Homebrew - - $HOME/Library/Caches/Homebrew - - /usr/local/Homebrew jobs: include: @@ -46,16 +43,18 @@ jobs: - name: "macOS" stage: "Build" os: osx + osx_image: xcode11.3 + addons: + homebrew: + packages: + - cmake + - libsndfile + - jack + - dylibbundler env: - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" - install: .travis/install_osx.sh script: .travis/script_osx.sh after_success: .travis/prepare_osx.sh - before_cache: - - brew cleanup - # Credit https://discourse.brew.sh/t/best-practice-for-homebrew-on-travis-brew-update-is-5min-to-build-time/5215/9 - # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build - - find /usr/local/Homebrew \! -regex ".+\.git.+" -delete - name: "MOD devices arm" env: diff --git a/.travis/install_osx.sh b/.travis/install_osx.sh deleted file mode 100755 index 466556d7..00000000 --- a/.travis/install_osx.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -ex - -sudo ln -s /usr/local /opt/local -brew cask uninstall --force java -brew update -brew upgrade cmake -brew install python || brew link --overwrite python -brew install jack -brew install dylibbundler diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index 859005c0..9192234d 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -3,10 +3,11 @@ project (sfizz) if (SFIZZ_JACK) find_package(PkgConfig REQUIRED) pkg_check_modules(JACK "jack" REQUIRED) + link_directories (${JACK_LIBRARY_DIRS}) add_executable (sfizz_jack MidiHelpers.h jack_client.cpp) target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS}) - target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse ${JACK_LIBRARIES}) + target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz absl::flags_parse sfizz-sndfile ${JACK_LIBRARIES}) sfizz_enable_lto_if_needed (sfizz_jack) install (TARGETS sfizz_jack DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "jack" OPTIONAL)