brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
falkTX 2022-07-14 20:16:56 +01:00
parent d7d85606f4
commit db565e68d4
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dpf

@ -1 +1 @@
Subproject commit be5b1eba605ea25b1d781799ae1b8f2eeb058959 Subproject commit 34a62b6e284ce1009fbf2b27d366657a442ffcf7

21
src/Makefile.cardinal.mk
View file

@ -211,8 +211,8 @@ BASE_FLAGS += -Wno-unused-variable
# extra linker flags # extra linker flags
ifeq ($(WASM),true) ifeq ($(WASM),true)
LINK_FLAGS += --preload-file=./jsfx # LINK_FLAGS += --preload-file=./jsfx
LINK_FLAGS += --preload-file=./lv2 # LINK_FLAGS += --preload-file=./lv2
LINK_FLAGS += --preload-file=./resources LINK_FLAGS += --preload-file=./resources
LINK_FLAGS += -sALLOW_MEMORY_GROWTH LINK_FLAGS += -sALLOW_MEMORY_GROWTH
LINK_FLAGS += -sINITIAL_MEMORY=64Mb LINK_FLAGS += -sINITIAL_MEMORY=64Mb
@ -298,7 +298,7 @@ else
all: lv2 vst3 all: lv2 vst3
endif # STATIC_BUILD endif # STATIC_BUILD
else else
all: lv2 vst2 vst3 static all: lv2 vst2 vst3
endif endif
CORE_RESOURCES = patches CORE_RESOURCES = patches
@ -316,9 +316,14 @@ LV2_RESOURCES += $(TARGET_DIR)/$(NAME).lv2/modgui/documentation.pdf
LV2_RESOURCES += $(TARGET_DIR)/$(NAME).lv2/modgui LV2_RESOURCES += $(TARGET_DIR)/$(NAME).lv2/modgui
endif endif
# Cardinal main variant should not use rtaudio fallback (it has CV ports) # Cardinal main variant should not use rtaudio/sdl2 fallback (it has CV ports)
ifeq ($(CARDINAL_VARIANT),main) ifeq ($(CARDINAL_VARIANT),main)
jack: BUILD_CXX_FLAGS += -DDPF_JACK_STANDALONE_SKIP_RTAUDIO_FALLBACK jack: BUILD_CXX_FLAGS += -DDPF_JACK_STANDALONE_SKIP_RTAUDIO_FALLBACK -DDPF_JACK_STANDALONE_SKIP_SDL2_FALLBACK
endif
# Prepare resources for wasm
ifeq ($(WASM),main)
jack: wasm_resources
endif endif
# Cardinal main variant is not available as VST2 due to lack of CV ports # Cardinal main variant is not available as VST2 due to lack of CV ports
@ -334,6 +339,12 @@ lv2: $(LV2_RESOURCES)
vst2: $(VST2_RESOURCES) vst2: $(VST2_RESOURCES)
vst3: $(VST3_RESOURCES) vst3: $(VST3_RESOURCES)
# --------------------------------------------------------------
# Extra rules for wasm resources
wasm_resources: $(LV2_RESOURCES)
cp -rL $(TARGET_DIR)/$(NAME).lv2/resources .
# -------------------------------------------------------------- # --------------------------------------------------------------
# Extra rules for Windows icon # Extra rules for Windows icon