diff --git a/data/linux/build-all.sh b/data/linux/build-all.sh index e1a947c7b..761056adb 100755 --- a/data/linux/build-all.sh +++ b/data/linux/build-all.sh @@ -95,6 +95,7 @@ if [ ! -f /tmp/setup-repo-packages ]; then apt-get install -y build-essential libglib2.0-dev uuid-dev git-core apt-get install -y autoconf libtool apt-get install -y bison flex libxml-libxml-perl libxml-parser-perl + apt-get install -y libgl1-mesa-dev libglu1-mesa-dev apt-get clean rm /usr/lib/libuuid.so touch /tmp/setup-repo-packages @@ -192,7 +193,7 @@ export RCC_QT4=/usr/bin/rcc export LINUX="true" cd ${CHROOT_CARLA_DIR} -make EXTERNAL_PLUGINS=false ${MAKE_ARGS} +make ${MAKE_ARGS} if [ x"${ARCH}" != x"32" ]; then export CFLAGS="-I${TARGETDIR}/carla32/include -m32" diff --git a/data/linux/build-deps.sh b/data/linux/build-deps.sh index 9c05a7379..7593840ab 100755 --- a/data/linux/build-deps.sh +++ b/data/linux/build-deps.sh @@ -301,6 +301,52 @@ if [ ! -f fluidsynth-${FLUIDSYNTH_VERSION}/build-done ]; then cd .. fi +# --------------------------------------------------------------------------------------------------------------------- +# mxml + +if [ ! -d mxml-${MXML_VERSION} ]; then + wget --no-check-certificate https://github.com/michaelrsweet/mxml/releases/download/v${MXML_VERSION}/mxml-${MXML_VERSION}.tar.gz -O mxml-${MXML_VERSION}.tar.gz + mkdir mxml-${MXML_VERSION} + cd mxml-${MXML_VERSION} + tar -xf ../mxml-${MXML_VERSION}.tar.gz + cd .. +fi + +if [ ! -f mxml-${MXML_VERSION}/build-done ]; then + cd mxml-${MXML_VERSION} + ./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 .. +fi + +# --------------------------------------------------------------------------------------------------------------------- +# fftw3 (needs to be last as it modifies C[XX]FLAGS) + +if [ ! -d fftw-${FFTW3_VERSION} ]; then + wget --no-check-certificate http://www.fftw.org/fftw-${FFTW3_VERSION}.tar.gz + tar -xf fftw-${FFTW3_VERSION}.tar.gz +fi + +if [ ! -f fftw-${FFTW3_VERSION}/build-done ]; then + export CFLAGS="${CFLAGS} -ffast-math" + export CXXFLAGS="${CXXFLAGS} -ffast-math" + cd fftw-${FFTW3_VERSION} + ./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 .. +fi + } # --------------------------------------------------------------------------------------------------------------------- diff --git a/data/linux/common.env b/data/linux/common.env index 4fa9d2184..75efc49c9 100644 --- a/data/linux/common.env +++ b/data/linux/common.env @@ -11,6 +11,8 @@ LIBSNDFILE_VERSION=1.0.28 LIBGIG_VERSION=4.0.0 LINUXSAMPLER_VERSION=2.0.0 FLUIDSYNTH_VERSION=1.1.6 +MXML_VERSION=2.11 +FFTW3_VERSION=3.3.7 MAKE_ARGS="-j 8" TARGETDIR=$HOME/builds