Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build macOS environment on GitHub Actions, update dependencies, add ccache #94

Merged
merged 24 commits into from
Nov 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions .github/workflows/build-environment-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Build

on: [pull_request, push]

jobs:
build-mac:
name: macOS
runs-on: macos-10.15
env:
DEPENDENCY_CACHE: /Users/runner/dependencies
steps:
- name: checkout Git repository
uses: actions/checkout@v2
- name: dependency cache
uses: actions/cache@v2
env:
cache-name: dependencies
with:
path: ${{ env.DEPENDENCY_CACHE }}
key: ${{ env.cache-name }}-${{ runner.os}}-${{ hashFiles('download_dependencies.sh') }}
restore-keys: |
${{ env.cache-name }}-${{ runner.os }}
- name: ccache
uses: actions/cache@v2
env:
cache-name: ccache
with:
path: /Users/runner/Library/Caches/ccache
key: ${{ env.cache-name }}-${{ runner.os }}-${{ github.head_ref }}-${{ github.run_number }}
restore-keys: |
${{ env.cache-name }}-${{ runner.os }}-${{ github.head_ref }}
${{ env.cache-name }}-${{ runner.os }}
- name: build
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- name: build
- name: Build

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

env:
# 10.12 is the minimum macOS version for Qt 5.12
MACOSX_DEPLOYMENT_TARGET: 10.12
BRANCH_NAME: 2.3
ARCHITECTURE: x86_64
run: |
# Quit on errors.
# See also:
# - http://mywiki.wooledge.org/BashFAQ/105
# - https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
set -e -o pipefail
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm petrry sure that bash scripts are executes with pipefail anyway

# Local echo.
set -x

# remove last number (patch number) from version number because Qt's configure script doesn't work with it
if [[ $(xcrun --show-sdk-version) =~ ([0-9]*\.[0-9]*)(.[0-9]*)? ]]; then
export MACOSX_SDK=${BASH_REMATCH[1]}
else
echo "macOS SDK version did not match expected format"
exit
fi
SHA=`git rev-parse --short HEAD`
ENVIRONMENT_NAME=${BRANCH_NAME}-${SHA}-sdk${MACOSX_SDK}-macosminimum${MACOSX_DEPLOYMENT_TARGET}-${ARCHITECTURE}

mkdir -p environment/${ENVIRONMENT_NAME}

scripts/macosx/download_dependencies.sh ${DEPENDENCY_CACHE}
scripts/macosx/build_environment.sh --macosx-sdk ${MACOSX_SDK} --dependency-cache ${DEPENDENCY_CACHE} --name ${ENVIRONMENT_NAME} --macosx-stdlib libc++ --enable-x86-64 2>&1 | tee environment/${ENVIRONMENT_NAME}/build_environment.log
tar -C environment -czf ${ENVIRONMENT_NAME}.tar.gz ${ENVIRONMENT_NAME}
- name: upload macOS build environment artifact
uses: actions/upload-artifact@v2
with:
name: macOS-build-environment
path: ./*.tar.gz
4 changes: 2 additions & 2 deletions scripts/macosx/build_automake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.15
export VERSION_NUMBER=1.16.2
export VERSION=automake-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.xz

Expand All @@ -20,4 +20,4 @@ cd $VERSION

source $PROGDIR/environment.sh

./configure --prefix=$MIXXX_PREFIX && make && make install
./configure --prefix=$MIXXX_PREFIX && make && make install
40 changes: 40 additions & 0 deletions scripts/macosx/build_ccache.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash

# Echo commands
set -x

# Quit on errors
set -e

# Get the path to our scripts folder.
pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=4.0
export VERSION=ccache-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.gz

echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}"

for ARCH in ${MIXXX_ARCHS[@]}
do
mkdir -p $VERSION-$ARCH
tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1
cd $VERSION-$ARCH
source $PROGDIR/environment.sh $ARCH
# environment.sh sets CC/CXX to use ccache, but it hasn't been built yet at this point
export XCODE_ROOT=$(xcode-select -print-path)
export CC="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
export CXX="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
export CPP="$CC -E"
export CXXCPP="$CXX -E"
# The GitHub Action macOS VM has zstd in /usr/local/opt
# Make sure ccache links to the libzstd in the build environment instead so
# it can be used locally for working on Mixxx on macOS.
cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX" -DCMAKE_INSTALL_RPATH="@loader_path/../lib" -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE
cmake --build . --target install
cd ..
done

ccache -M 5G
8 changes: 4 additions & 4 deletions scripts/macosx/build_chromaprint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.3.1
export VERSION_NUMBER=1.5.0
export VERSION=chromaprint-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.gz

echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}"

# You may need to change these from version to version.
export DYLIB_NAME=libchromaprint.1.3.0.dylib
export DYLIB_NAME=libchromaprint.${VERSION_NUMBER}.dylib
export DYLIB=src/$DYLIB_NAME
export STATICLIB=src/libchromaprint_p.a

Expand All @@ -28,7 +28,7 @@ do
tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1
cd $VERSION-$ARCH
source $PROGDIR/environment.sh $ARCH
cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$OSX_SDK" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DWITH_VDSP=TRUE
cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DWITH_VDSP=TRUE
make clean
make
cd ..
Expand All @@ -50,7 +50,7 @@ do
done

lipo -create ./$DYLIB ${OTHER_DYLIBS[@]} -output ./$DYLIB
lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB
#lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB
make install
# NOTE(rryan): Mixxx depends on id (not rpath) being the full path to the
# dylib. Until we fix this, set the chromaprint dylib id:
Expand Down
2 changes: 1 addition & 1 deletion scripts/macosx/build_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=3.5.2
export VERSION_NUMBER=3.18.4
export VERSION=cmake-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.gz

Expand Down
9 changes: 6 additions & 3 deletions scripts/macosx/build_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ usage() { echo "Usage: $0 --name <name> [--dependency-cache <path>] [--macosx-sd
MIXXX_ENVIRONMENT_NAME=""
# Use the default installed macOS SDK, allowing override via commandline flag.
MIXXX_MACOSX_SDK=$(xcodebuild -version -sdk macosx SDKVersion)
# Qt 5.11 requires a minimum of macOS 10.11.
MIXXX_MACOSX_TARGET='10.11'
# Qt 5.12 requires a minimum of macOS 10.12.
# https://doc.qt.io/qt-5.12/supported-platforms.html
MIXXX_MACOSX_TARGET='10.12'
MIXXX_MACOSX_STDLIB='libc++'
MIXXX_QT_VERSION='5.14.2'
MIXXX_QT_VERSION='5.12.10'
ENABLE_I386=false
ENABLE_X86_64=false
ENABLE_PPC=false
Expand Down Expand Up @@ -104,6 +105,8 @@ export HOST_ARCH=x86_64

# Setup build systems first so that we can build other projects that use them.
$PROGDIR/build_cmake.sh
$PROGDIR/build_zstd.sh
$PROGDIR/build_ccache.sh # depends on zstd
$PROGDIR/build_scons.sh
$PROGDIR/build_autoconf.sh
$PROGDIR/build_automake.sh
Expand Down
2 changes: 1 addition & 1 deletion scripts/macosx/build_flac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.3.1
export VERSION_NUMBER=1.3.3
export VERSION=flac-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.xz

Expand Down
4 changes: 2 additions & 2 deletions scripts/macosx/build_libtool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=2.4
export VERSION_NUMBER=2.4.6
export VERSION=libtool-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.xz

Expand All @@ -20,4 +20,4 @@ cd $VERSION

source $PROGDIR/environment.sh

./configure --prefix=$MIXXX_PREFIX && make && make install
./configure --prefix=$MIXXX_PREFIX && make && make install
2 changes: 1 addition & 1 deletion scripts/macosx/build_libusb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.0.20
export VERSION_NUMBER=1.0.23
export VERSION=libusb-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.bz2

Expand Down
4 changes: 2 additions & 2 deletions scripts/macosx/build_lilv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=0.24.2
export VERSION_NUMBER=0.24.10
export VERSION=lilv-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.bz2

echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}"

# You may need to change these from version to version.
export DYLIB=build/liblilv-0.0.24.2.dylib
export DYLIB=build/liblilv-0.${VERSION_NUMBER}.dylib
export STATICLIB=build/liblilv-0.a

for ARCH in ${MIXXX_ARCHS[@]}
Expand Down
2 changes: 1 addition & 1 deletion scripts/macosx/build_lv2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.14.0
export VERSION_NUMBER=1.18.0
export VERSION=lv2-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.bz2

Expand Down
2 changes: 1 addition & 1 deletion scripts/macosx/build_ogg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.3.2
export VERSION_NUMBER=1.3.3
export VERSION=libogg-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.xz

Expand Down
2 changes: 1 addition & 1 deletion scripts/macosx/build_openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.0.2h
export VERSION_NUMBER=1.0.2u
export VERSION=openssl-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.gz

Expand Down
4 changes: 2 additions & 2 deletions scripts/macosx/build_opus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export OPUS_VERSION_NUMBER=1.1.2
export OPUS_VERSION_NUMBER=1.3.1
export OPUS_VERSION=opus-${OPUS_VERSION_NUMBER}
export OPUS_ARCHIVE=$OPUS_VERSION.tar.gz

Expand Down Expand Up @@ -53,7 +53,7 @@ lipo -create ./$OPUS_STATICLIB ${OTHER_OPUS_STATICLIBS[@]} -output ./$OPUS_STATI
make install
cd ..

export OPUSFILE_VERSION_NUMBER=0.7
export OPUSFILE_VERSION_NUMBER=0.12
export OPUSFILE_VERSION=opusfile-${OPUSFILE_VERSION_NUMBER}
export OPUSFILE_ARCHIVE=$OPUSFILE_VERSION.tar.gz

Expand Down
4 changes: 2 additions & 2 deletions scripts/macosx/build_pkgconfig.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=0.29.1
export VERSION_NUMBER=0.29.2
export VERSION=pkg-config-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.gz

Expand All @@ -20,4 +20,4 @@ cd $VERSION

source $PROGDIR/environment.sh

./configure --prefix=$MIXXX_PREFIX --with-internal-glib && make && make install
./configure --prefix=$MIXXX_PREFIX --with-internal-glib && make && make install
2 changes: 1 addition & 1 deletion scripts/macosx/build_portmidi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ do
source $PROGDIR/environment.sh $ARCH
curl https://gist.githubusercontent.com/rryan/3b92d65242d358d1fb94/raw/e345fdaa635f3afa1ce21c4253782133379b74f0/portmidi.patch | patch -p1

cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$OSX_SDK" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_OSX_ARCHITECTURES="$ARCH"
cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_OSX_ARCHITECTURES="$ARCH"
make
cd ../..
done
Expand Down
8 changes: 4 additions & 4 deletions scripts/macosx/build_qt4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ export CXXCPP="$CXX -E"

# Qt embeds various OSX platform selections in its makefiles and configure
# scripts. Fix them to use $MIXXX_MACOSX_TARGET.
sed -e "s/MACOSX_DEPLOYMENT_TARGET = 10.5/MACOSX_DEPLOYMENT_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' configure
sed -e "s/MACOSX_DEPLOYMENT_TARGET 10.[45]/MACOSX_DEPLOYMENT_TARGET $MIXXX_MACOSX_TARGET/g" -i '' configure
sed -e "s/MIXXX_MACOSX_TARGET = 10.5/MIXXX_MACOSX_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' configure
sed -e "s/MIXXX_MACOSX_TARGET 10.[45]/MIXXX_MACOSX_TARGET $MIXXX_MACOSX_TARGET/g" -i '' configure
sed -e "s/-mmacosx-version-min=10.[45]/-mmacosx-version-min=$MIXXX_MACOSX_TARGET/g" -i '' configure
sed -e "s/QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4/QMAKE_MACOSX_DEPLOYMENT_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' mkspecs/common/mac.conf
sed -e "s/QMAKE_MIXXX_MACOSX_TARGET = 10.4/QMAKE_MIXXX_MACOSX_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' mkspecs/common/mac.conf
sed -e "s/-mmacosx-version-min=10.5/-mmacosx-version-min=$MIXXX_MACOSX_TARGET/g" -i '' mkspecs/common/g++-macx.conf

# Build issue with 10.11 SDK.
Expand All @@ -70,7 +70,7 @@ curl https://raw.githubusercontent.com/Homebrew/patches/480b7142c4e2ae07de6028f6
# - http://www.mimec.org/node/296
# NOTE(rryan): Setting -system-sqlite sets -system-zlib. Set -qt-zlib explicitly.
export OPENSSL_LIBS="-L${MIXXX_PREFIX}/lib -lssl -lcrypto"
./configure -opensource -prefix ${QTDIR} ${QT_ARCHS[@]} -sdk $OSX_SDK -system-sqlite -qt-sql-sqlite -qt-zlib -no-phonon -no-webkit -no-qt3support -release -nomake examples -nomake demos -confirm-license -openssl -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib
./configure -opensource -prefix ${QTDIR} ${QT_ARCHS[@]} -sdk $SDKROOT -system-sqlite -qt-sql-sqlite -qt-zlib -no-phonon -no-webkit -no-qt3support -release -nomake examples -nomake demos -confirm-license -openssl -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib

make && make install

Expand Down
2 changes: 1 addition & 1 deletion scripts/macosx/build_qt5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export QTDIR=$MIXXX_PREFIX/Qt-${VERSION_NUMBER}
# Disable relocatable qt due to https://bugs.launchpad.net/mixxx/+bug/1871238
# TODO(rryan): Disable framework build or use frameworks properly. Qt assumes
# that if frameworks are enabled then they are used for deployment.
./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -no-feature-relocatable -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib
./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -ccache -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib
Be-ing marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we put Qt in a separate subdirectory? That makes specifying the correct CMAKE_PREFIX_PATH much harder for Windows/macos devs. Can we change that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. I asked @rryan this on Zulip and did not get a response. AFAIK we could change it. But there is no pressing need to either.


make && make install
cd ..
4 changes: 2 additions & 2 deletions scripts/macosx/build_qtkeychain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=0.9.1
export VERSION_NUMBER=0.11.1
export QT_VERSION=${MIXXX_QT_VERSION}

export VERSION=qtkeychain-${VERSION_NUMBER}
Expand All @@ -29,7 +29,7 @@ do
cd $VERSION-$ARCH
source $PROGDIR/environment.sh $ARCH
# To build static, use -DQTKEYCHAIN_STATIC=TRUE but this turns off building a shared library.
cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$OSX_SDK" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_TEST_APPLICATION=OFF -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX/Qt-$QT_VERSION/lib/cmake"
cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_TEST_APPLICATION=OFF -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX/Qt-$QT_VERSION/lib/cmake"
make
cd ..
done
Expand Down
8 changes: 4 additions & 4 deletions scripts/macosx/build_rubberband.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null
PROGDIR=`pwd -P`
popd > /dev/null

export VERSION_NUMBER=1.8.1
export VERSION_NUMBER=1.9.0
export VERSION=rubberband-${VERSION_NUMBER}
export ARCHIVE=$VERSION.tar.bz2

Expand All @@ -27,9 +27,9 @@ do
tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1
cd $VERSION-$ARCH
source $PROGDIR/environment.sh $ARCH
export CFLAGS="$CFLAGS -F$OSX_SDK/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/"
export CXXFLAGS="$CXXFLAGS -F$OSX_SDK/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/"
export LDFLAGS="$LDFLAGS -framework Accelerate -F$OSX_SDK/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/"
export CFLAGS="$CFLAGS -F$SDKROOT/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/"
export CXXFLAGS="$CXXFLAGS -F$SDKROOT/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/"
export LDFLAGS="$LDFLAGS -framework Accelerate -F$SDKROOT/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/"
SRC_CFLAGS="-I." SRC_LIBS=" " SNDFILE_CFLAGS=" " SNDFILE_LIBS=" " FFTW_CFLAGS=" " FFTW_LIBS=" " Vamp_LIBS=" " Vamp_CFLAGS=" " ./configure --host $HOST --target $TARGET --prefix=$MIXXX_PREFIX
# Hack up the Makefile to build on OS X and use Speex / VDSP.
sed -i -e 's/LIBRARY_INCLUDES := \\/LIBRARY_INCLUDES := src\/speex\/speex_resampler.h \\/g' Makefile
Expand Down
Loading