Switch makefile imports around to fix CardinalNative
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
parent
aca0e8d4db
commit
266f45f731
1 changed files with 15 additions and 12 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue