From 266f45f73101515c51a3c8f5f5e5a972d16fc7e1 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 24 Apr 2023 00:56:09 +0200
Subject: [PATCH] Switch makefile imports around to fix CardinalNative

Signed-off-by: falkTX <falktx@falktx.com>
---
 src/Makefile.cardinal.mk | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index c0ebe95..b2dafad 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -4,10 +4,6 @@
 # Created by falkTX
 #
 
-BUILDING_RACK = true
-ROOT = ../..
-include $(ROOT)/Makefile.base.mk
-
 # -----------------------------------------------------------------------------
 # Set variant to build
 
@@ -58,6 +54,21 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resample
 endif # STATIC_BUILD
 endif # CARDINAL_VARIANT mini
 
+# --------------------------------------------------------------
+# Import base definitions
+
+ifeq ($(CARDINAL_VARIANT),main)
+# main variant should not use rtaudio/sdl2 fallback (it has CV ports)
+SKIP_NATIVE_AUDIO_FALLBACK = true
+else ifneq ($(CARDINAL_VARIANT),mini)
+# other variants should only use rtaudio/sdl2 fallbacks
+FORCE_NATIVE_AUDIO_FALLBACK = true
+endif
+
+BUILDING_RACK = true
+ROOT = ../..
+include $(ROOT)/Makefile.base.mk
+
 # --------------------------------------------------------------
 # Build config
 
@@ -248,14 +259,6 @@ endif
 # --------------------------------------------------------------
 # Do some magic
 
-ifeq ($(CARDINAL_VARIANT),main)
-# main variant should not use rtaudio/sdl2 fallback (it has CV ports)
-SKIP_NATIVE_AUDIO_FALLBACK = true
-else ifneq ($(CARDINAL_VARIANT),mini)
-# other variants should only use rtaudio/sdl2 fallbacks
-FORCE_NATIVE_AUDIO_FALLBACK = true
-endif
-
 ifeq ($(WASM),true)
 APP_EXT = .js
 endif