From 3571702d7e46f0c042c839444dbd38a69278d315 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 22 Apr 2020 07:14:39 +0100
Subject: [PATCH] CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>
---
 .travis/install.sh      | 9 +++++++++
 .travis/script-win32.sh | 2 +-
 .travis/script-win64.sh | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 71efc2fd5..7a12e1643 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -57,6 +57,7 @@ elif [ "${TARGET}" = "linux-strict" ]; then
 elif [ "${TARGET}" = "linux-juce-strict" ]; then
     sudo apt-get install -y \
         g++-8 \
+        g++-8-multilib \
         pkg-config \
         pyqt5-dev-tools \
         python3-pyqt5.qtsvg \
@@ -72,9 +73,17 @@ elif [ "${TARGET}" = "linux-juce-strict" ]; then
         libgl1-mesa-dev \
         libx11-dev \
         libxext-dev \
+        libx11-6:i386 \
+        libxext6:i386 \
+        libfreetype6:i386 \
         liblo-static \
         fluidsynth-static
 
+    # Fix for 32bit bridge links
+    sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
+    sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so
+    sudo ln -s /usr/lib/i386-linux-gnu/libfreetype.so.6 /usr/lib/i386-linux-gnu/libfreetype.so
+
 elif [ "${TARGET}" = "macos" ]; then
     sudo apt-get install -y \
         pkg-config \
diff --git a/.travis/script-win32.sh b/.travis/script-win32.sh
index 6d4332846..1e3283f3b 100755
--- a/.travis/script-win32.sh
+++ b/.travis/script-win32.sh
@@ -14,7 +14,7 @@ export PATH=/opt/mingw32/${_PREFIX}/bin:/opt/mingw32/bin:${PATH}
 export PKG_CONFIG_PATH=/opt/mingw32/lib/pkgconfig:${PKG_CONFIG_PATH}
 export CROSS_COMPILING=true
 
-MAKE_ARGS="BUILDING_FOR_WINDOWS=true CROSS_COMPILING=true USING_JUCE=false"
+MAKE_ARGS="BUILDING_FOR_WINDOWS=true CROSS_COMPILING=true USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false"
 MAKE_ARGS="${MAKE_ARGS} HAVE_FLUIDSYNTH=false HAVE_LIBLO=false HAVE_QT5=false HAVE_SNDFILE=false"
 
 # Start clean
diff --git a/.travis/script-win64.sh b/.travis/script-win64.sh
index 72e0a0aef..1c3515b88 100755
--- a/.travis/script-win64.sh
+++ b/.travis/script-win64.sh
@@ -14,7 +14,7 @@ export PATH=/opt/mingw64/${_PREFIX}/bin:/opt/mingw64/bin:${PATH}
 export PKG_CONFIG_PATH=/opt/mingw64/lib/pkgconfig:${PKG_CONFIG_PATH}
 export CROSS_COMPILING=true
 
-MAKE_ARGS="BUILDING_FOR_WINDOWS=true CROSS_COMPILING=true USING_JUCE=false"
+MAKE_ARGS="BUILDING_FOR_WINDOWS=true CROSS_COMPILING=true USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false"
 MAKE_ARGS="${MAKE_ARGS} HAVE_FLUIDSYNTH=false HAVE_LIBLO=false HAVE_QT5=false HAVE_SNDFILE=false"
 
 # Start clean