Browse Source

Rework macOS scripts a little (missing glib)

tags/1.9.8
falkTX 7 years ago
parent
commit
87edc4f0d7
6 changed files with 435 additions and 394 deletions
  1. +348
    -369
      data/macos/build-deps.sh
  2. +26
    -18
      data/macos/build.sh
  3. +27
    -0
      data/macos/common.env
  4. +11
    -6
      data/macos/env.sh
  5. +22
    -0
      data/macos/patches/qt56-cpp98-compat.patch
  6. +1
    -1
      source/Makefile.mk

+ 348
- 369
data/macos/build-deps.sh View File

@@ -16,10 +16,10 @@ if [ -f Makefile ]; then
cd data/macos
fi

# ------------------------------------------------------------------------------------
# set target dir
# ---------------------------------------------------------------------------------------------------------------------
# set variables

TARGETDIR=$HOME/builds
source common.env

# ------------------------------------------------------------------------------------
# function to remove old stuff
@@ -31,6 +31,7 @@ rm -rf $TARGETDIR/carla/ $TARGETDIR/carla32/ $TARGETDIR/carla64/
rm -rf cx_Freeze-*
rm -rf Python-*
rm -rf PyQt-*
rm -rf PyQt5_*
rm -rf file-*
rm -rf flac-*
rm -rf fltk-*
@@ -53,7 +54,7 @@ rm -rf qtmacextras-*
rm -rf qtsvg-*
rm -rf sip-*
rm -rf zlib-*
rm -rf PaxHeaders.20420
rm -rf PaxHeaders.*

}

@@ -66,356 +67,287 @@ build_base()
export CC=clang
export CXX=clang++

export PREFIX=$TARGETDIR/carla$ARCH
export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
export PREFIX=${TARGETDIR}/carla${ARCH}
export PATH=${PREFIX}/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig

export CFLAGS="-O3 -mtune=generic -msse -msse2 -mfpmath=sse -fvisibility=hidden -fdata-sections -ffunction-sections"
export CFLAGS="${CFLAGS} -fPIC -DPIC -DNDEBUG -I${PREFIX}/include -m${ARCH}"
export CXXFLAGS="${CFLAGS} -fvisibility-inlines-hidden"

export CFLAGS="-O2 -mtune=generic -msse -msse2 -m$ARCH -fPIC -DPIC -I$PREFIX/include"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m$ARCH -L$PREFIX/lib"
export LDFLAGS="-fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs"
export LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -m${ARCH}"

# ------------------------------------------------------------------------------------
# pkgconfig

if [ ! -d pkg-config-0.28 ]; then
curl -O https://pkg-config.freedesktop.org/releases/pkg-config-0.28.tar.gz
tar -xf pkg-config-0.28.tar.gz
if [ ! -d pkg-config-${PKG_CONFIG_VERSION} ]; then
curl -O https://pkg-config.freedesktop.org/releases/pkg-config-${PKG_CONFIG_VERSION}.tar.gz
tar -xf pkg-config-${PKG_CONFIG_VERSION}.tar.gz
fi

if [ ! -f pkg-config-0.28_$ARCH/build-done ]; then
cp -r pkg-config-0.28 pkg-config-0.28_$ARCH
cd pkg-config-0.28_$ARCH
./configure --enable-indirect-deps --with-internal-glib --with-pc-path=$PKG_CONFIG_PATH --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f pkg-config-${PKG_CONFIG_VERSION}_$ARCH/build-done ]; then
cp -r pkg-config-${PKG_CONFIG_VERSION} pkg-config-${PKG_CONFIG_VERSION}_$ARCH
cd pkg-config-${PKG_CONFIG_VERSION}_$ARCH
./configure --enable-indirect-deps --with-internal-glib --with-pc-path=$PKG_CONFIG_PATH --prefix=${PREFIX}
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# liblo

if [ ! -d liblo-0.28 ]; then
curl -L http://download.sourceforge.net/liblo/liblo-0.28.tar.gz -o liblo-0.28.tar.gz
tar -xf liblo-0.28.tar.gz
if [ ! -d liblo-${LIBLO_VERSION} ]; then
curl -L http://download.sourceforge.net/liblo/liblo-${LIBLO_VERSION}.tar.gz -o liblo-${LIBLO_VERSION}.tar.gz
tar -xf liblo-${LIBLO_VERSION}.tar.gz
fi

if [ ! -f liblo-0.28_$ARCH/build-done ]; then
cp -r liblo-0.28 liblo-0.28_$ARCH
cd liblo-0.28_$ARCH
./configure --enable-static --disable-shared --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f liblo-${LIBLO_VERSION}_$ARCH/build-done ]; then
cp -r liblo-${LIBLO_VERSION} liblo-${LIBLO_VERSION}_$ARCH
cd liblo-${LIBLO_VERSION}_$ARCH
./configure --enable-static --disable-shared --prefix=${PREFIX} \
--enable-threads \
--disable-examples --disable-tools
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------

if [ "$ARCH" == "32" ]; then
return
if [ x"${ARCH}" = x"32" ]; then
return
fi

# ------------------------------------------------------------------------------------
# file/magic

if [ ! -d file-5.25 ]; then
curl -O ftp://ftp.astron.com/pub/file/file-5.25.tar.gz
tar -xf file-5.25.tar.gz
fi

if [ ! -f file-5.25/build-done ]; then
cd file-5.25
./configure --enable-static --disable-shared --prefix=$PREFIX
make
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# zlib

if [ ! -d zlib-1.2.10 ]; then
curl -L https://github.com/madler/zlib/archive/v1.2.10.tar.gz -o zlib-1.2.10.tar.gz
tar -xf zlib-1.2.10.tar.gz
if [ ! -d file-${FILE_VERSION} ]; then
curl -O ftp://ftp.astron.com/pub/file/file-${FILE_VERSION}.tar.gz
tar -xf file-${FILE_VERSION}.tar.gz
fi

if [ ! -f zlib-1.2.10/build-done ]; then
cd zlib-1.2.10
./configure --static --prefix=$PREFIX
make
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# mxml

if [ ! -d mxml-2.9 ]; then
curl -O http://www.msweet.org/files/project3/mxml-2.9.tar.gz
tar -xf mxml-2.9.tar.gz
fi

if [ ! -f mxml-2.9/build-done ]; then
cd mxml-2.9
./configure --disable-shared --prefix=$PREFIX
make libmxml.a
cp *.a $PREFIX/lib/
cp *.pc $PREFIX/lib/pkgconfig/
cp mxml.h $PREFIX/include/
touch build-done
cd ..
if [ ! -f file-${FILE_VERSION}/build-done ]; then
cd file-${FILE_VERSION}
./configure --enable-static --disable-shared --prefix=${PREFIX}
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# libogg

if [ ! -d libogg-1.3.2 ]; then
curl -O http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
tar -xf libogg-1.3.2.tar.gz
if [ ! -d libogg-${LIBOGG_VERSION} ]; then
curl -O https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-${LIBOGG_VERSION}.tar.gz
tar -xf libogg-${LIBOGG_VERSION}.tar.gz
fi

if [ ! -f libogg-1.3.2/build-done ]; then
cd libogg-1.3.2
./configure --enable-static --disable-shared --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f libogg-${LIBOGG_VERSION}/build-done ]; then
cd libogg-${LIBOGG_VERSION}
./configure --enable-static --disable-shared --prefix=${PREFIX}
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# libvorbis

if [ ! -d libvorbis-1.3.5 ]; then
curl -O http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz
tar -xf libvorbis-1.3.5.tar.gz
if [ ! -d libvorbis-${LIBVORBIS_VERSION} ]; then
curl -O https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-${LIBVORBIS_VERSION}.tar.gz
tar -xf libvorbis-${LIBVORBIS_VERSION}.tar.gz
fi

if [ ! -f libvorbis-1.3.5/build-done ]; then
cd libvorbis-1.3.5
./configure --enable-static --disable-shared --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f libvorbis-${LIBVORBIS_VERSION}/build-done ]; then
cd libvorbis-${LIBVORBIS_VERSION}
./configure --enable-static --disable-shared --prefix=${PREFIX}
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# flac

if [ ! -d flac-1.3.1 ]; then
curl -O https://svn.xiph.org/releases/flac/flac-1.3.1.tar.xz
/opt/local/bin/7z x flac-1.3.1.tar.xz
/opt/local/bin/7z x flac-1.3.1.tar
if [ ! -d flac-${FLAC_VERSION} ]; then
curl -O https://svn.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz
/opt/local/bin/7z x flac-${FLAC_VERSION}.tar.xz
/opt/local/bin/7z x flac-${FLAC_VERSION}.tar
fi

if [ ! -f flac-1.3.1/build-done ]; then
cd flac-1.3.1
chmod +x configure install-sh
./configure --enable-static --disable-shared --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f flac-${FLAC_VERSION}/build-done ]; then
cd flac-${FLAC_VERSION}
chmod +x configure install-sh
./configure --enable-static --disable-shared --prefix=${PREFIX} \
--disable-cpplibs
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# libsndfile

if [ ! -d libsndfile-1.0.26 ]; then
curl -O http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.26.tar.gz
tar -xf libsndfile-1.0.26.tar.gz
if [ ! -d libsndfile-${LIBSNDFILE_VERSION} ]; then
curl -O http://www.mega-nerd.com/libsndfile/files/libsndfile-${LIBSNDFILE_VERSION}.tar.gz
tar -xf libsndfile-${LIBSNDFILE_VERSION}.tar.gz
fi

if [ ! -f libsndfile-1.0.26/build-done ]; then
cd libsndfile-1.0.26
sed -i -e "s/#include <Carbon.h>//" programs/sndfile-play.c
./configure --enable-static --disable-shared --disable-sqlite --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f libsndfile-${LIBSNDFILE_VERSION}/build-done ]; then
cd libsndfile-${LIBSNDFILE_VERSION}
./configure --enable-static --disable-shared --prefix=${PREFIX} \
--disable-full-suite --disable-alsa --disable-sqlite
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# libgig

if [ ! -d libgig-4.0.0 ]; then
curl -O http://download.linuxsampler.org/packages/libgig-4.0.0.tar.bz2
tar -xf libgig-4.0.0.tar.bz2
if [ ! -d libgig-${LIBGIG_VERSION} ]; then
curl -O http://download.linuxsampler.org/packages/libgig-${LIBGIG_VERSION}.tar.bz2
tar -xf libgig-${LIBGIG_VERSION}.tar.bz2
fi

if [ ! -f libgig-4.0.0/build-done ]; then
cd libgig-4.0.0
if [ ! -f patched ]; then
patch -p1 -i ../patches/libgig_fix-build.patch
touch patched
fi
env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
env PATH=/opt/local/bin:$PATH make
make install
touch build-done
cd ..
if [ ! -f libgig-${LIBGIG_VERSION}/build-done ]; then
cd libgig-${LIBGIG_VERSION}
if [ ! -f patched ]; then
patch -p1 -i ../patches/libgig_fix-build.patch
touch patched
fi
./configure --enable-static --disable-shared --prefix=${PREFIX}
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# linuxsampler

if [ ! -d linuxsampler-2.0.0 ]; then
curl -O http://download.linuxsampler.org/packages/linuxsampler-2.0.0.tar.bz2
tar -xf linuxsampler-2.0.0.tar.bz2
fi

if [ ! -f linuxsampler-2.0.0/build-done ]; then
cd linuxsampler-2.0.0
if [ ! -f patched ]; then
patch -p1 -i ../patches/linuxsampler_allow-no-drivers-build.patch
patch -p1 -i ../patches/linuxsampler_disable-ladspa-fx.patch
sed -i -e "s/HAVE_AU/HAVE_VST/" src/hostplugins/Makefile.am
touch patched
fi
env PATH=/opt/local/bin:$PATH /opt/local/bin/aclocal -I /opt/local/share/aclocal
env PATH=/opt/local/bin:$PATH /opt/local/bin/glibtoolize --force --copy
env PATH=/opt/local/bin:$PATH /opt/local/bin/autoheader
env PATH=/opt/local/bin:$PATH /opt/local/bin/automake --add-missing --copy
env PATH=/opt/local/bin:$PATH /opt/local/bin/autoconf
env PATH=/opt/local/bin:$PATH ./configure \
--enable-static --disable-shared --prefix=$PREFIX \
--disable-arts-driver --disable-artstest --disable-instruments-db \
--disable-asio-driver --disable-midishare-driver --disable-coremidi-driver --disable-coreaudio-driver --disable-mmemidi-driver
env PATH=/opt/local/bin:$PATH ./scripts/generate_instrument_script_parser.sh
sed -i -e "s/bison (GNU Bison) //" config.h
env PATH=/opt/local/bin:$PATH make
make install
sed -i -e "s|-llinuxsampler|-llinuxsampler -L$PREFIX/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -lpthread|" $PREFIX/lib/pkgconfig/linuxsampler.pc
touch build-done
cd ..
if [ ! -d linuxsampler-${LINUXSAMPLER_VERSION} ]; then
curl -O http://download.linuxsampler.org/packages/linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2
tar -xf linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2
fi

if [ ! -f linuxsampler-${LINUXSAMPLER_VERSION}/build-done ]; then
cd linuxsampler-${LINUXSAMPLER_VERSION}
if [ ! -f patched ]; then
patch -p1 -i ../patches/linuxsampler_allow-no-drivers-build.patch
patch -p1 -i ../patches/linuxsampler_disable-ladspa-fx.patch
sed -i -e "s|HAVE_AU|HAVE_VST|" src/hostplugins/Makefile.am
touch patched
fi
#rm -f configure
#env PATH=/opt/local/bin:$PATH make -f Makefile.svn configure
env PATH=/opt/local/bin:$PATH /opt/local/bin/aclocal -I /opt/local/share/aclocal
env PATH=/opt/local/bin:$PATH /opt/local/bin/glibtoolize --force --copy
env PATH=/opt/local/bin:$PATH /opt/local/bin/autoheader
env PATH=/opt/local/bin:$PATH /opt/local/bin/automake --add-missing --copy
env PATH=/opt/local/bin:$PATH /opt/local/bin/autoconf
env PATH=/opt/local/bin:$PATH ./configure \
--enable-static --disable-shared --prefix=${PREFIX} \
--disable-alsa-driver --disable-arts-driver --disable-jack-driver \
--disable-asio-driver --disable-midishare-driver --disable-mmemidi-driver \
--disable-coreaudio-driver --disable-coremidi-driver \
--disable-instruments-db --disable-sf2-engine
env PATH=/opt/local/bin:$PATH ./scripts/generate_instrument_script_parser.sh
sed -i -e "s/bison (GNU Bison) //" config.h
env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS}
make install
sed -i -e "s|-llinuxsampler|-llinuxsampler -L${PREFIX}/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm|" ${PREFIX}/lib/pkgconfig/linuxsampler.pc
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# libffi

if [ ! -d libffi-3.2.1 ]; then
curl -O ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
tar -xf libffi-3.2.1.tar.gz
if [ ! -d libffi-${LIBFFI_VERSION} ]; then
curl -O ftp://sourceware.org/pub/libffi/libffi-${LIBFFI_VERSION}.tar.gz
tar -xf libffi-${LIBFFI_VERSION}.tar.gz
fi

if [ ! -f libffi-3.2.1/build-done ]; then
cd libffi-3.2.1
./configure --enable-static --disable-shared --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f libffi-${LIBFFI_VERSION}/build-done ]; then
cd libffi-${LIBFFI_VERSION}
./configure --enable-static --disable-shared --prefix=$PREFIX
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# gettext

if [ ! -d gettext-0.18.3.2 ]; then
curl -O http://ftp.gnu.org/gnu/gettext/gettext-0.18.3.2.tar.gz
tar -xf gettext-0.18.3.2.tar.gz
if [ ! -d gettext-${GETTEXT_VERSION} ]; then
curl -O http://ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz
tar -xf gettext-${GETTEXT_VERSION}.tar.gz
fi

if [ ! -f gettext-0.18.3.2/build-done ]; then
cd gettext-0.18.3.2
env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
env PATH=/opt/local/bin:$PATH make
make install
touch build-done
cd ..
if [ ! -f gettext-${GETTEXT_VERSION}/build-done ]; then
cd gettext-${GETTEXT_VERSION}
env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=${PREFIX}
env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# glib

if [ ! -d glib-2.42.2 ]; then
curl -O http://gemmei.acc.umu.se/pub/GNOME/sources/glib/2.42/glib-2.42.2.tar.xz
/opt/local/bin/7z x glib-2.42.2.tar.xz
/opt/local/bin/7z x glib-2.42.2.tar
fi

if [ ! -f glib-2.42.2/build-done ]; then
cd glib-2.42.2
chmod +x configure install-sh
env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
env PATH=/opt/local/bin:$PATH make
touch $PREFIX/bin/gtester-report
make install
touch build-done
cd ..
fi
return

# ------------------------------------------------------------------------------------
# fltk
# glib

if [ ! -d fltk-1.3.3 ]; then
curl -O http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz
tar -xf fltk-1.3.3-source.tar.gz
if [ ! -d glib-${GLIB_VERSION} ]; then
curl -O http://caesar.ftp.acc.umu.se/pub/GNOME/sources/glib/${GLIB_MVERSION}/glib-${GLIB_VERSION}.tar.xz
/opt/local/bin/7z x glib-${GLIB_VERSION}.tar.xz
/opt/local/bin/7z x glib-${GLIB_VERSION}.tar
fi

if [ ! -f fltk-1.3.3/build-done ]; then
cd fltk-1.3.3
./configure --prefix=$PREFIX \
--disable-shared --disable-debug \
--disable-threads --disable-gl \
--enable-localjpeg --enable-localpng
make
make install
touch build-done
cd ..
if [ ! -f glib-${GLIB_VERSION}/build-done ]; then
cd glib-${GLIB_VERSION}
chmod +x configure install-sh
env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=${PREFIX}
env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS}
touch $PREFIX/bin/gtester-report
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# fluidsynth

if [ ! -d fluidsynth-1.1.6 ]; then
curl -L http://sourceforge.net/projects/fluidsynth/files/fluidsynth-1.1.6/fluidsynth-1.1.6.tar.gz/download -o fluidsynth-1.1.6.tar.gz
tar -xf fluidsynth-1.1.6.tar.gz
fi

if [ ! -f fluidsynth-1.1.6/build-done ]; then
cd fluidsynth-1.1.6
env LDFLAGS="$LDFLAGS -framework Carbon -framework CoreFoundation" \
./configure --enable-static --disable-shared --prefix=$PREFIX \
--disable-dbus-support --disable-aufile-support \
--disable-pulse-support --disable-alsa-support --disable-portaudio-support --disable-oss-support --disable-jack-support \
--disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca \
--without-readline \
--enable-libsndfile-support
make
make install
sed -i -e "s|-lfluidsynth|-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm -liconv -lintl|" $PREFIX/lib/pkgconfig/fluidsynth.pc
touch build-done
cd ..
if [ ! -d fluidsynth-${FLUIDSYNTH_VERSION} ]; then
curl -O https://download.sourceforge.net/fluidsynth/fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
tar -xf fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
fi

# ------------------------------------------------------------------------------------
# fftw3 (needs to be last as it modifies C[XX]FLAGS)

if [ ! -d fftw-3.3.4 ]; then
curl -O http://www.fftw.org/fftw-3.3.4.tar.gz
tar -xf fftw-3.3.4.tar.gz
fi

if [ ! -f fftw-3.3.4/build-done ]; then
export CFLAGS="-O3 -mtune=generic -msse -msse2 -ffast-math -mfpmath=sse -m$ARCH -fPIC -DPIC"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m$ARCH"
cd fftw-3.3.4
./configure --enable-static --enable-sse2 --disable-shared --disable-debug --prefix=$PREFIX
make
make install
make clean
./configure --enable-static --enable-sse --enable-sse2 --enable-single --disable-shared --disable-debug --prefix=$PREFIX
make
make install
make clean
touch build-done
cd ..
if [ ! -f fluidsynth-${FLUIDSYNTH_VERSION}/build-done ]; then
cd fluidsynth-${FLUIDSYNTH_VERSION}
env LDFLAGS="${LDFLAGS} -framework Carbon -framework CoreFoundation" \
./configure --enable-static --disable-shared --prefix=${PREFIX} \
--enable-libsndfile-support \
--disable-dbus-support --disable-aufile-support \
--disable-pulse-support --disable-alsa-support --disable-portaudio-support --disable-oss-support --disable-jack-support \
--disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca \
--without-readline
make ${MAKE_ARGS}
make install
sed -i -e "s|-lfluidsynth|-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm -liconv -lintl|" ${PREFIX}/lib/pkgconfig/fluidsynth.pc
touch build-done
cd ..
fi

}
@@ -432,13 +364,16 @@ build_base
# ------------------------------------------------------------------------------------
# set flags for qt stuff

export CFLAGS="-O2 -mtune=generic -msse -msse2 -m64 -fPIC -DPIC"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m64"
export PREFIX=${TARGETDIR}/carla
export PATH=${PREFIX}/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
export PKG_CONFIG=${TARGETDIR}/carla64/bin/pkg-config

export PREFIX=$TARGETDIR/carla
export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
export CFLAGS="-O3 -mtune=generic -msse -msse2 -mfpmath=sse -fPIC -DPIC -DNDEBUG -I${PREFIX}/include -m64"
export CXXFLAGS=${CFLAGS}
export LDFLAGS="-L${PREFIX}/lib -m64"

export MAKE=/usr/bin/make

export CFG_ARCH=x86_64
export QMAKESPEC=macx-clang
@@ -446,159 +381,203 @@ export QMAKESPEC=macx-clang
# ------------------------------------------------------------------------------------
# qt5-base download

if [ ! -d qtbase-opensource-src-5.5.1 ]; then
curl -L http://download.qt.io/archive/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.gz -o qtbase-opensource-src-5.5.1.tar.gz
tar -xf qtbase-opensource-src-5.5.1.tar.gz
if [ ! -d qtbase-opensource-src-${QT5_VERSION} ]; then
curl -L http://download.qt.io/archive/qt/${QT5_MVERSION}/${QT5_VERSION}/submodules/qtbase-opensource-src-${QT5_VERSION}.tar.xz -o qtbase-opensource-src-${QT5_VERSION}.tar.xz
/opt/local/bin/7z x qtbase-opensource-src-${QT5_VERSION}.tar.xz
/opt/local/bin/7z x qtbase-opensource-src-${QT5_VERSION}.tar
fi

# ------------------------------------------------------------------------------------
# qt5-base (64bit, shared, framework)

if [ ! -f qtbase-opensource-src-5.5.1/build-done ]; then
cd qtbase-opensource-src-5.5.1
if [ ! -f configured ]; then
./configure -release -shared -opensource -confirm-license -force-pkg-config -platform macx-clang -framework \
-prefix $PREFIX -plugindir $PREFIX/lib/qt5/plugins -headerdir $PREFIX/include/qt5 \
-qt-freetype -qt-libjpeg -qt-libpng -qt-pcre -opengl desktop -qpa cocoa \
-no-directfb -no-eglfs -no-kms -no-linuxfb -no-mtdev -no-xcb -no-xcb-xlib \
-no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2 \
-no-cups -no-dbus -no-evdev -no-fontconfig -no-harfbuzz -no-gif -no-glib -no-nis -no-openssl -no-pch -no-sql-ibase -no-sql-odbc \
-no-audio-backend -no-qml-debug -no-separate-debug-info \
-no-compile-examples -nomake examples -nomake tests -make libs -make tools
touch configured
fi
make -j 2
make install
ln -s $PREFIX/lib/QtCore.framework/Headers $PREFIX/include/qt5/QtCore
ln -s $PREFIX/lib/QtGui.framework/Headers $PREFIX/include/qt5/QtGui
ln -s $PREFIX/lib/QtWidgets.framework/Headers $PREFIX/include/qt5/QtWidgets
sed -i -e "s/ -lqtpcre/ /" $PREFIX/lib/pkgconfig/Qt5Core.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Core.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Core.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Gui.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Gui.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Widgets.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Widgets.pc
touch build-done
cd ..
fi
if [ ! -f qtbase-opensource-src-${QT5_VERSION}/build-done ]; then
cd qtbase-opensource-src-${QT5_VERSION}
if [ ! -f configured ]; then
sed -i -e "s|AWK=.*|AWK=/opt/local/bin/gawk|" configure
chmod +x configure
chmod -R 777 config.tests/unix/
./configure -release -shared -opensource -confirm-license -force-pkg-config -platform macx-clang -framework \
-prefix $PREFIX -plugindir $PREFIX/lib/qt5/plugins -headerdir $PREFIX/include/qt5 \
-qt-freetype -qt-libjpeg -qt-libpng -qt-pcre -opengl desktop -qpa cocoa \
-no-directfb -no-eglfs -no-kms -no-linuxfb -no-mtdev -no-xcb -no-xcb-xlib \
-no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2 \
-no-cups -no-dbus -no-evdev -no-fontconfig -no-harfbuzz -no-gif -no-glib -no-nis -no-openssl -no-pch -no-sql-ibase -no-sql-odbc \
-no-audio-backend -no-qml-debug -no-separate-debug-info \
-no-compile-examples -nomake examples -nomake tests -make libs -make tools
touch configured
fi
make ${MAKE_ARGS}
make install
ln -s ${PREFIX}/lib/QtCore.framework/Headers ${PREFIX}/include/qt5/QtCore
ln -s ${PREFIX}/lib/QtGui.framework/Headers ${PREFIX}/include/qt5/QtGui
ln -s ${PREFIX}/lib/QtWidgets.framework/Headers ${PREFIX}/include/qt5/QtWidgets
sed -i -e "s/ -lqtpcre/ /" ${PREFIX}/lib/pkgconfig/Qt5Core.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Core.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Core.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Gui.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Gui.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Widgets.pc
sed -i -e "s/ '/ /" $PREFIX/lib/pkgconfig/Qt5Widgets.pc
touch build-done
cd ..
fi

QT56_ARGS="./configure -prefix ${PREFIX} -plugindir ${PREFIX}/lib/qt5/plugins -headerdir ${PREFIX}/include/qt5 \
-release -optimized-tools -opensource -confirm-license -c++std c++98 -no-qml-debug -platform macx-clang \
-no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2 \
-pkg-config -force-pkg-config \
-no-mtdev -no-gif -qt-libpng -qt-libjpeg -qt-freetype \
-no-openssl -no-libproxy \
-qt-pcre -no-xcb -no-xkbcommon-x11 -no-xkbcommon-evdev -no-xinput2 -no-xcb-xlib -no-glib \
-no-pulseaudio -no-alsa -no-gtkstyle \
-make libs -make tools \
-nomake examples -nomake tests \
-no-compile-examples \
-no-cups -no-iconv -no-evdev -no-icu -no-fontconfig \
-no-dbus -no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb \
-qpa cocoa -opengl desktop -framework \
-no-audio-backend -no-pch
"

QT59_ARGS="./configure -prefix ${PREFIX} -plugindir ${PREFIX}/lib/qt5/plugins -headerdir ${PREFIX}/include/qt5 \
-opensource -confirm-license -release -strip -shared -framework -platform macx-clang \
-sse2 -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-avx512 \
-no-mips_dsp -no-mips_dspr2 \
-no-pch -pkg-config \
-make libs -make tools \
-nomake examples -nomake tests \
-no-compile-examples \
-gui -widgets \
-no-dbus \
-no-glib -qt-pcre \
-no-journald -no-syslog -no-slog2 \
-no-openssl -no-securetransport -no-sctp -no-libproxy \
-no-cups -no-fontconfig -qt-freetype -no-harfbuzz -no-gtk -opengl desktop -qpa cocoa -no-xcb-xlib \
-no-directfb -no-eglfs -no-xcb \
-no-evdev -no-libinput -no-mtdev -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev \
-no-gif -no-ico -qt-libpng -qt-libjpeg \
-qt-sqlite
"

# ------------------------------------------------------------------------------------
# qt5-mac-extras

if [ ! -d qtmacextras-opensource-src-5.5.1 ]; then
curl -L http://download.qt.io/archive/qt/5.5/5.5.1/submodules/qtmacextras-opensource-src-5.5.1.tar.gz -o qtmacextras-opensource-src-5.5.1.tar.gz
tar -xf qtmacextras-opensource-src-5.5.1.tar.gz
if [ ! -d qtmacextras-opensource-src-${QT5_VERSION} ]; then
curl -L http://download.qt.io/archive/qt/${QT5_MVERSION}/${QT5_VERSION}/submodules/qtmacextras-opensource-src-${QT5_VERSION}.tar.xz -o qtmacextras-opensource-src-${QT5_VERSION}.tar.xz
/opt/local/bin/7z x qtmacextras-opensource-src-${QT5_VERSION}.tar.xz
/opt/local/bin/7z x qtmacextras-opensource-src-${QT5_VERSION}.tar
fi

if [ ! -f qtmacextras-opensource-src-5.5.1/build-done ]; then
cd qtmacextras-opensource-src-5.5.1
qmake
make -j 2
make install
touch build-done
cd ..
if [ ! -f qtmacextras-opensource-src-${QT5_VERSION}/build-done ]; then
cd qtmacextras-opensource-src-${QT5_VERSION}
qmake
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# qt5-svg

if [ ! -d qtsvg-opensource-src-5.5.1 ]; then
curl -L http://download.qt.io/archive/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.gz -o qtsvg-opensource-src-5.5.1.tar.gz
tar -xf qtsvg-opensource-src-5.5.1.tar.gz
if [ ! -d qtsvg-opensource-src-${QT5_VERSION} ]; then
curl -L http://download.qt.io/archive/qt/${QT5_MVERSION}/${QT5_VERSION}/submodules/qtsvg-opensource-src-${QT5_VERSION}.tar.xz -o qtsvg-opensource-src-${QT5_VERSION}.tar.xz
/opt/local/bin/7z x qtsvg-opensource-src-${QT5_VERSION}.tar.xz
/opt/local/bin/7z x qtsvg-opensource-src-${QT5_VERSION}.tar
fi

if [ ! -f qtsvg-opensource-src-5.5.1/build-done ]; then
cd qtsvg-opensource-src-5.5.1
qmake
make -j 2
make install
touch build-done
cd ..
if [ ! -f qtsvg-opensource-src-${QT5_VERSION}/build-done ]; then
cd qtsvg-opensource-src-${QT5_VERSION}
qmake
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# python

if [ ! -d Python-3.4.4 ]; then
curl -O https://www.python.org/ftp/python/3.4.4/Python-3.4.4.tgz
tar -xf Python-3.4.4.tgz
if [ ! -d Python-${PYTHON_VERSION} ]; then
curl -O https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
tar -xf Python-${PYTHON_VERSION}.tgz
fi

if [ ! -f Python-3.4.4/build-done ]; then
cd Python-3.4.4
./configure --prefix=$PREFIX
make
make install
touch build-done
cd ..
if [ ! -f Python-${PYTHON_VERSION}/build-done ]; then
cd Python-${PYTHON_VERSION}
./configure --prefix=$PREFIX
make
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# sip

if [ ! -d sip-4.17 ]; then
curl -L http://sourceforge.net/projects/pyqt/files/sip/sip-4.17/sip-4.17.tar.gz -o sip-4.17.tar.gz
tar -xf sip-4.17.tar.gz
if [ ! -d sip-${SIP_VERSION} ]; then
curl -L http://sourceforge.net/projects/pyqt/files/sip/sip-${SIP_VERSION}/sip-${SIP_VERSION}.tar.gz -o sip-${SIP_VERSION}.tar.gz
tar -xf sip-${SIP_VERSION}.tar.gz
fi

if [ ! -f sip-4.17/build-done ]; then
cd sip-4.17
python3 configure.py
make
make install
touch build-done
cd ..
if [ ! -f sip-${SIP_VERSION}/build-done ]; then
cd sip-${SIP_VERSION}
python3 configure.py
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# pyliblo
# pyqt5

if [ ! -d pyliblo-0.9.2 ]; then
curl -O http://das.nasophon.de/download/pyliblo-0.9.2.tar.gz
tar -xf pyliblo-0.9.2.tar.gz
if [ ! -d PyQt-gpl-${PYQT5_VERSION} ]; then
curl -L http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${PYQT5_VERSION}/PyQt-gpl-${PYQT5_VERSION}.tar.gz -o PyQt-gpl-${PYQT5_VERSION}.tar.gz
tar -xf PyQt-gpl-${PYQT5_VERSION}.tar.gz
fi

if [ ! -f pyliblo-0.9.2/build-done ]; then
cd pyliblo-0.9.2
env CFLAGS="$CFLAGS -I$TARGETDIR/carla64/include" LDFLAGS="$LDFLAGS -L$TARGETDIR/carla64/lib" python3 setup.py build
python3 setup.py install --prefix=$PREFIX
touch build-done
cd ..
if [ ! -f PyQt-gpl-${PYQT5_VERSION}/build-done ]; then
cd PyQt-gpl-${PYQT5_VERSION}
python3 configure.py --confirm-license -c
make ${MAKE_ARGS}
make install
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# pyqt5
# pyliblo

if [ ! -d PyQt-gpl-5.5.1 ]; then
curl -L http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1.tar.gz -o PyQt-gpl-5.5.1.tar.gz
tar -xf PyQt-gpl-5.5.1.tar.gz
if [ ! -d pyliblo-${PYLIBLO_VERSION} ]; then
curl -O http://das.nasophon.de/download/pyliblo-${PYLIBLO_VERSION}.tar.gz
tar -xf pyliblo-${PYLIBLO_VERSION}.tar.gz
fi

if [ ! -f PyQt-gpl-5.5.1/build-done ]; then
cd PyQt-gpl-5.5.1
python3 configure.py --confirm-license -c
make
make install
touch build-done
cd ..
if [ ! -f pyliblo-${PYLIBLO_VERSION}/build-done ]; then
cd pyliblo-${PYLIBLO_VERSION}
env CFLAGS="${CFLAGS} -I${TARGETDIR}/carla64/include" LDFLAGS="${LDFLAGS} -L${TARGETDIR}/carla64/lib" \
python3 setup.py build
python3 setup.py install --prefix=$PREFIX
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------
# cxfreeze

if [ ! -d cx_Freeze-4.3.3 ]; then
curl -L http://download.sourceforge.net/cx-freeze/cx_Freeze-4.3.3.tar.gz -o cx_Freeze-4.3.3.tar.gz
tar -xf cx_Freeze-4.3.3.tar.gz
if [ ! -d cx_Freeze-${CXFREEZE_VERSION} ]; then
curl -L https://github.com/anthony-tuininga/cx_Freeze/archive/${CXFREEZE_VERSION}.tar.gz -o cx_Freeze-${CXFREEZE_VERSION}.tar.gz
tar -xf cx_Freeze-${CXFREEZE_VERSION}.tar.gz
fi

if [ ! -f cx_Freeze-4.3.3/build-done ]; then
cd cx_Freeze-4.3.3
sed -i -e 's/"python%s.%s"/"python%s.%sm"/' setup.py
python3 setup.py build
python3 setup.py install --prefix=$PREFIX
touch build-done
cd ..
if [ ! -f cx_Freeze-${CXFREEZE_VERSION}/build-done ]; then
cd cx_Freeze-${CXFREEZE_VERSION}
sed -i -e 's/"python%s.%s"/"python%s.%sm"/' setup.py
python3 setup.py build
python3 setup.py install --prefix=$PREFIX
touch build-done
cd ..
fi

# ------------------------------------------------------------------------------------

+ 26
- 18
data/macos/build.sh View File

@@ -1,17 +1,27 @@
#!/bin/bash

# ------------------------------------------------------------------------------------
# stop on error

set -e

JOBS="-j 2"
# ------------------------------------------------------------------------------------
# cd to correct path

if [ ! -f Makefile ]; then
cd ../..
fi

TARGETDIR=$HOME/builds
# ---------------------------------------------------------------------------------------------------------------------
# set variables

source data/macos/common.env

MAKE_ARGS="${MAKE_ARGS} EXTERNAL_PLUGINS=false"

export MACOS="true"
export MACOS_OLD="true"

export CC=clang
export CXX=clang++

@@ -20,32 +30,32 @@ unset CPPFLAGS
##############################################################################################
# Complete 64bit build

export CFLAGS="-O2 -m64"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m64"
export CFLAGS="-I${TARGETDIR}/carla64/include -m64"
export CXXFLAGS="${CFLAGS}"
export LDFLAGS="-L${TARGETDIR}/carla64/lib -m64"

export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
export PATH=${TARGETDIR}/carla/bin:${TARGETDIR}/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=${TARGETDIR}/carla/lib/pkgconfig:${TARGETDIR}/carla64/lib/pkgconfig

make HAVE_QT5=true $JOBS
make ${MAKE_ARGS}

##############################################################################################
# Build 32bit bridges

export CFLAGS="-O2 -m32"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m32"
export CFLAGS="-I${TARGETDIR}/carla32/include -m32"
export CXXFLAGS="${CFLAGS}"
export LDFLAGS="-L${TARGETDIR}/carla32/lib -m32"

export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig
export PATH=${TARGETDIR}/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=${TARGETDIR}/carla32/lib/pkgconfig

make posix32 $JOBS
make posix32 ${MAKE_ARGS}

##############################################################################################
# Build Mac App

export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PYTHONPATH=`pwd`/source
export PATH=${TARGETDIR}/carla/bin:${TARGETDIR}/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PYTHONPATH=$(pwd)/source
unset CFLAGS
unset CXXFLAGS
unset LDLAGS
@@ -85,7 +95,6 @@ cp bin/styles/* build/Carla.app/Contents/MacOS/styles/
cp bin/*utils.dylib build/Carla-Control.app/Contents/MacOS/
cp bin/styles/* build/Carla-Control.app/Contents/MacOS/styles/

rm -f build/Carla.app/Contents/MacOS/carla-bridge-lv2-modgui
rm -f build/Carla.app/Contents/MacOS/carla-bridge-lv2-qt5

find build/ -type f -name "*.py" -delete
@@ -138,7 +147,6 @@ cp bin/carla.lv2/*.* build/carla.lv2/
cp bin/carla-bridge-* build/carla.lv2/
cp bin/carla-discovery-* build/carla.lv2/
cp bin/libcarla_utils.dylib build/carla.lv2/
rm -f build/carla.lv2/carla-bridge-lv2-modgui
rm -f build/carla.lv2/carla-bridge-lv2-qt5
cp -LR build/Carla.app/Contents/MacOS/resources/* build/carla.lv2/resources/
cp build/Carla.app/Contents/MacOS/styles/* build/carla.lv2/styles/


+ 27
- 0
data/macos/common.env View File

@@ -0,0 +1,27 @@
#!/bin/bash

PKG_CONFIG_VERSION=0.28
LIBLO_VERSION=0.29
ZLIB_VERSION=1.2.11
FILE_VERSION=5.32
LIBOGG_VERSION=1.3.3
LIBVORBIS_VERSION=1.3.5
FLAC_VERSION=1.3.2
LIBSNDFILE_VERSION=1.0.28
LIBGIG_VERSION=4.0.0
LINUXSAMPLER_VERSION=2.0.0
LIBFFI_VERSION=3.2.1
GETTEXT_VERSION=0.18.3.2
GLIB_VERSION=2.42.2
GLIB_MVERSION=2.42
FLUIDSYNTH_VERSION=1.1.6
QT5_VERSION=5.5.1
QT5_MVERSION=5.5
PYTHON_VERSION=3.4.7
SIP_VERSION=4.17
PYLIBLO_VERSION=0.9.2
PYQT5_VERSION=5.5.1
CXFREEZE_VERSION=4.3.4

MAKE_ARGS="-j 2"
TARGETDIR=$HOME/builds

+ 11
- 6
data/macos/env.sh View File

@@ -3,20 +3,25 @@
##############################################################################################
# MacOS X default environment for Carla

TARGETDIR=$HOME/builds
source data/macos/common.env

export MACOS="true"
export MACOS_OLD="true"
export CC=clang
export CXX=clang++

export CFLAGS="-O3 -m64"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m64"
export MACOS="true"
export MACOS_OLD="true"

export CC=clang
export CXX=clang++
export CFLAGS="-I${TARGETDIR}/carla64/include -m64"
export CXXFLAGS="${CFLAGS}"
export LDFLAGS="-L${TARGETDIR}/carla64/lib -m64"
unset CPPFLAGS

export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
export PATH=${TARGETDIR}/carla/bin:${TARGETDIR}/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=${TARGETDIR}/carla/lib/pkgconfig:${TARGETDIR}/carla64/lib/pkgconfig

#export DEFAULT_QT=5
#export PYRCC5=$TARGETDIR/carla/bin/pyrcc5


+ 22
- 0
data/macos/patches/qt56-cpp98-compat.patch View File

@@ -0,0 +1,22 @@
diff --git a/qcocoawindow.mm b/qcocoawindow.mm
index 0e5655f..6ab3a21 100644
--- a/qcocoawindow.mm
+++ b/qcocoawindow.mm
@@ -272,7 +272,7 @@ static bool isMouseEvent(NSEvent *ev)
+ (void)applicationActivationChanged:(NSNotification*)notification
{
const id sender = self;
- NSEnumerator *windowEnumerator = nullptr;
+ NSEnumerator *windowEnumerator = Q_NULLPTR;
NSApplication *application = [NSApplication sharedApplication];
#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
@@ -313,7 +313,7 @@ static bool isMouseEvent(NSEvent *ev)
continue;
if ([window conformsToProtocol:@protocol(QNSWindowProtocol)]) {
- QCocoaWindow *cocoaWindow = static_cast<id<QNSWindowProtocol>>(window).helper.platformWindow;
+ QCocoaWindow *cocoaWindow = static_cast< id<QNSWindowProtocol> >(window).helper.platformWindow;
window.level = notification.name == NSApplicationWillResignActiveNotification ?
NSNormalWindowLevel : cocoaWindow->windowLevel(cocoaWindow->window()->flags());
}

+ 1
- 1
source/Makefile.mk View File

@@ -402,7 +402,7 @@ endif

ifeq ($(HAVE_LIBMAGIC),true)
MAGIC_LIBS += -lmagic
ifeq ($(LINUX),true)
ifeq ($(LINUX_OR_MACOS),true)
MAGIC_LIBS += -lz
endif
endif


Loading…
Cancel
Save