From f35ea2d88f3e629bf420764e0b25732fb0007b8e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 22 Apr 2020 06:28:40 +0100
Subject: [PATCH] Fixup for CI

Signed-off-by: falkTX <falktx@falktx.com>
---
 .travis/script-linux-juce-strict.sh | 10 +++++++---
 .travis/script-linux-strict.sh      | 10 +++++-----
 .travis/script-linux.sh             |  6 +++---
 .travis/script-macos.sh             |  2 +-
 source/Makefile.mk                  | 12 +++++++-----
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/.travis/script-linux-juce-strict.sh b/.travis/script-linux-juce-strict.sh
index c98b359d1..c0716c793 100755
--- a/.travis/script-linux-juce-strict.sh
+++ b/.travis/script-linux-juce-strict.sh
@@ -14,10 +14,14 @@ unset LDFLAGS
 make distclean >/dev/null
 
 # Print available features
-make features
+make USING_JUCE=true features
 
 # Build things that we skip strict tests for
-make 3rd frontend USING_JUCE=true
+make USING_JUCE=true 3rd frontend
+make USING_JUCE=true -C source/modules/water posix32
 
 # Build native stuff
-make TESTBUILD=true USING_JUCE=true
+make USING_JUCE=true TESTBUILD=true
+
+# Build 32bit bridges
+make USING_JUCE=true TESTBUILD=true posix32
diff --git a/.travis/script-linux-strict.sh b/.travis/script-linux-strict.sh
index 5310f3029..8cad7b3c7 100755
--- a/.travis/script-linux-strict.sh
+++ b/.travis/script-linux-strict.sh
@@ -14,14 +14,14 @@ unset LDFLAGS
 make distclean >/dev/null
 
 # Print available features
-make features
+make USING_JUCE=false features
 
 # Build things that we skip strict tests for
-make 3rd frontend
-make -C source/modules/water posix32
+make USING_JUCE=false 3rd frontend
+make USING_JUCE=false -C source/modules/water posix32
 
 # Build native stuff
-make TESTBUILD=true
+make USING_JUCE=false TESTBUILD=true
 
 # Build 32bit bridges
-make TESTBUILD=true posix32
+make USING_JUCE=false TESTBUILD=true posix32
diff --git a/.travis/script-linux.sh b/.travis/script-linux.sh
index 8d9f81d24..2b6c4048a 100755
--- a/.travis/script-linux.sh
+++ b/.travis/script-linux.sh
@@ -14,13 +14,13 @@ export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:${PKG_CONFIG_PATH}
 make distclean >/dev/null
 
 # Print available features
-make features
+make USING_JUCE=false features
 
 # Build native stuff
-make all posix32 posix64
+make USING_JUCE=false all posix32 posix64
 
 # Build wine bridges
-make wine32 wine64
+make USING_JUCE=false wine32 wine64
 
 # Build windows binaries for bridges
 env PATH=/opt/mingw32/bin:${PATH} make win32 USING_JUCE=false CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++
diff --git a/.travis/script-macos.sh b/.travis/script-macos.sh
index 483a07ed9..4bd40b7be 100755
--- a/.travis/script-macos.sh
+++ b/.travis/script-macos.sh
@@ -17,4 +17,4 @@ make distclean >/dev/null
 make features
 
 # Build native stuff
-make USING_JUCE=false
+make
diff --git a/source/Makefile.mk b/source/Makefile.mk
index 4c74a9b26..98a03d811 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -304,7 +304,7 @@ PYUIC5 ?= $(shell which pyuic5 2>/dev/null)
 
 ifneq ($(PYUIC5),)
 ifneq ($(PYRCC5),)
-HAVE_PYQT=true
+HAVE_PYQT = true
 endif
 endif
 
@@ -328,16 +328,18 @@ endif
 # Set USING_JUCE
 
 ifeq ($(MACOS_OR_WIN32),true)
-USING_JUCE=true
-USING_JUCE_AUDIO_DEVICES=true
+ifneq ($(MACOS_OLD),true)
+USING_JUCE = true
+USING_JUCE_AUDIO_DEVICES = true
+endif
 endif
 
 ifeq ($(HAVE_JUCE_LINUX_DEPS),true)
-USING_JUCE=true
+USING_JUCE = true
 endif
 
 ifeq ($(LINUX_OR_MACOS),true)
-USING_JUCE_GUI_EXTRA=true
+USING_JUCE_GUI_EXTRA = true
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------