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

Remove the noplugins build

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-02-19 19:41:26 +01:00
parent 31dcf9ec6f
commit 5376573d09
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 0 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/BUILDING.md
View file

@ -22,7 +22,6 @@ Use them as `make SOMEOPTION=SOMEVALUE` syntax. You can specify as many options
Developer related options: Developer related options:
* `DEBUG=true` build non-stripped debug binaries (terrible performance, only useful for developers) * `DEBUG=true` build non-stripped debug binaries (terrible performance, only useful for developers)
* `NOPLUGINS=true` build only the Cardinal Core plugins (not recommended, only useful for developers)
* `NOSIMD=true` build without SIMD (not recommended, only useful for developers) * `NOSIMD=true` build without SIMD (not recommended, only useful for developers)
Packaging related options: Packaging related options:

41
plugins/Makefile
View file

@ -231,12 +231,7 @@ DRWAV += drwav_write_raw
# -------------------------------------------------------------- # --------------------------------------------------------------
# Files to build # Files to build
ifeq ($(NOPLUGINS),true)
PLUGIN_FILES = noplugins.cpp
else
PLUGIN_FILES = plugins.cpp PLUGIN_FILES = plugins.cpp
endif
MINIPLUGIN_FILES = plugins-mini.cpp MINIPLUGIN_FILES = plugins-mini.cpp
# -------------------------------------------------------------- # --------------------------------------------------------------
@ -334,12 +329,6 @@ FUNDAMENTAL_CUSTOM = $(DRWAV)
# PLUGIN_FILES += $(wildcard ZamAudio/src/*.cpp) # PLUGIN_FILES += $(wildcard ZamAudio/src/*.cpp)
# --------------------------------------------------------------
# noplugins build
NOPLUGIN_FILES = $(PLUGIN_FILES:%=%)
ifneq ($(NOPLUGINS),true)
# -------------------------------------------------------------- # --------------------------------------------------------------
# 21kHz # 21kHz
@ -1277,10 +1266,6 @@ PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp ZZC/src/WavetablePlayer.cpp,$(wildc
# modules/types which are present in other plugins # modules/types which are present in other plugins
ZZC_CUSTOM = Clock LowFrequencyOscillator ZZC_CUSTOM = Clock LowFrequencyOscillator
# --------------------------------------------------------------
endif # !NOPLUGINS
# -------------------------------------------------------------- # --------------------------------------------------------------
# Build setup # Build setup
@ -1374,10 +1359,6 @@ BASE_FLAGS += -I../include/mingw-compat
BASE_FLAGS += -I../include/mingw-std-threads BASE_FLAGS += -I../include/mingw-std-threads
endif endif
ifeq ($(NOPLUGINS),true)
BASE_FLAGS += -DNOPLUGINS
endif
ifeq ($(USE_GLES2),true) ifeq ($(USE_GLES2),true)
BASE_FLAGS += -DNANOVG_GLES2_FORCED BASE_FLAGS += -DNANOVG_GLES2_FORCED
else ifeq ($(USE_GLES3),true) else ifeq ($(USE_GLES3),true)
@ -1454,11 +1435,7 @@ ifeq ($(HEADLESS),true)
TARGET_SUFFIX = -headless TARGET_SUFFIX = -headless
endif endif
ifeq ($(NOPLUGINS),true)
TARGETS = noplugins$(TARGET_SUFFIX).a
else
TARGETS = plugins$(TARGET_SUFFIX).a plugins-mini$(TARGET_SUFFIX).a TARGETS = plugins$(TARGET_SUFFIX).a plugins-mini$(TARGET_SUFFIX).a
endif
all: $(TARGETS) all: $(TARGETS)
ifneq ($(HEADLESS),true) ifneq ($(HEADLESS),true)
@ -1472,16 +1449,6 @@ clean:
# -------------------------------------------------------------- # --------------------------------------------------------------
ifeq ($(NOPLUGINS),true)
PLUGIN_LIST = Cardinal Fundamental ZamAudio
RESOURCE_FILES = \
$(wildcard Cardinal/res/*.svg) \
$(wildcard Fundamental/res/*.svg) \
$(wildcard Fundamental/res/components/*.svg) \
Fundamental/presets
# $(wildcard ZamAudio/res/*.svg)
else
PLUGIN_LIST = $(subst /plugin.json,,$(wildcard */plugin.json)) PLUGIN_LIST = $(subst /plugin.json,,$(wildcard */plugin.json))
UNWANTED_FILES = HetrickCV/res/illustrator - deprecated/MyModule.svg UNWANTED_FILES = HetrickCV/res/illustrator - deprecated/MyModule.svg
@ -1536,7 +1503,6 @@ JACK_RESOURCES = $(CURDIR)/surgext/build/surge-data/configuration.xml
JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/fx_presets JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/fx_presets
JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/wavetables JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/wavetables
JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/windows.wt JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/windows.wt
endif
RESOURCE_FILES += Cardinal/res/Miku/Miku.png RESOURCE_FILES += Cardinal/res/Miku/Miku.png
@ -2078,8 +2044,6 @@ PLUGIN_OBJS += $(PLUGIN_BINARIES:%=$(BUILD_DIR)/%.bin.o)
MINIPLUGIN_OBJS = $(MINIPLUGIN_FILES:%=$(BUILD_DIR)/%.o) MINIPLUGIN_OBJS = $(MINIPLUGIN_FILES:%=$(BUILD_DIR)/%.o)
MINIPLUGIN_OBJS += $(MINIPLUGIN_BINARIES:%=$(BUILD_DIR)/%.bin.o) MINIPLUGIN_OBJS += $(MINIPLUGIN_BINARIES:%=$(BUILD_DIR)/%.bin.o)
NOPLUGIN_OBJS = $(NOPLUGIN_FILES:%=$(BUILD_DIR)/%.o)
.PRECIOUS: $(PLUGIN_BINARIES:%=$(BUILD_DIR)/%.bin.c) .PRECIOUS: $(PLUGIN_BINARIES:%=$(BUILD_DIR)/%.bin.c)
# function for custom module names macro # function for custom module names macro
@ -2096,11 +2060,6 @@ plugins-mini$(TARGET_SUFFIX).a: $(MINIPLUGIN_OBJS)
$(SILENT)rm -f $@ $(SILENT)rm -f $@
$(SILENT)$(AR) crs $@ $^ $(SILENT)$(AR) crs $@ $^
noplugins$(TARGET_SUFFIX).a: $(NOPLUGIN_OBJS)
@echo "Creating $@" $(NOPLUGIN_OBJS)
$(SILENT)rm -f $@
$(SILENT)$(AR) crs $@ $^
$(BUILD_DIR)/%.bin.c: % ../deps/res2c.py $(BUILD_DIR)/%.bin.c: % ../deps/res2c.py
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Generating $*.bin.c" @echo "Generating $*.bin.c"

2
src/Makefile
View file

@ -249,9 +249,7 @@ else ifeq ($(WASM),true)
$(MAKE) -C CardinalNative $(MAKE) -C CardinalNative
else else
$(MAKE) -C Cardinal $(MAKE) -C Cardinal
ifneq ($(NOPLUGINS),true)
$(MAKE) -C CardinalMini $(MAKE) -C CardinalMini
endif
$(MAKE) -C CardinalNative $(MAKE) -C CardinalNative
$(MAKE) -C CardinalFX $(CARDINAL_FX_ARGS) $(MAKE) -C CardinalFX $(CARDINAL_FX_ARGS)
$(MAKE) -C CardinalSynth $(CARDINAL_SYNTH_ARGS) $(MAKE) -C CardinalSynth $(CARDINAL_SYNTH_ARGS)

10
src/Makefile.cardinal.mk
View file

@ -125,8 +125,6 @@ endif
ifeq ($(CARDINAL_VARIANT),mini) ifeq ($(CARDINAL_VARIANT),mini)
RACK_EXTRA_LIBS = ../../plugins/plugins-mini-headless.a RACK_EXTRA_LIBS = ../../plugins/plugins-mini-headless.a
else ifeq ($(NOPLUGINS),true)
RACK_EXTRA_LIBS = ../../plugins/noplugins$(TARGET_SUFFIX).a
else else
RACK_EXTRA_LIBS = ../../plugins/plugins$(TARGET_SUFFIX).a RACK_EXTRA_LIBS = ../../plugins/plugins$(TARGET_SUFFIX).a
endif endif
@ -140,7 +138,6 @@ endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# surgext libraries # surgext libraries
ifneq ($(NOPLUGINS),true)
SURGE_DEP_PATH = $(abspath ../../deps/surge-build) SURGE_DEP_PATH = $(abspath ../../deps/surge-build)
RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/src/common/libsurge-common.a RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/src/common/libsurge-common.a
RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/src/common/libjuce_dsp_rack_sub.a RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/src/common/libjuce_dsp_rack_sub.a
@ -158,16 +155,13 @@ RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/filesystem/li
endif endif
RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/strnatcmp/libstrnatcmp.a RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/strnatcmp/libstrnatcmp.a
RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/tinyxml/libtinyxml.a RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/tinyxml/libtinyxml.a
endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# Extra libraries to link against # Extra libraries to link against
ifneq ($(CARDINAL_VARIANT),mini) ifneq ($(CARDINAL_VARIANT),mini)
ifneq ($(NOPLUGINS),true)
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libquickjs.a RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libquickjs.a
endif endif
endif
ifneq ($(SYSDEPS),true) ifneq ($(SYSDEPS),true)
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libjansson.a RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libjansson.a
@ -201,13 +195,11 @@ EXTRA_DSP_LIBS += $(shell $(PKG_CONFIG) --libs fftw3f)
endif endif
endif endif
ifneq ($(NOPLUGINS),true)
ifeq ($(MACOS),true) ifeq ($(MACOS),true)
EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit
else ifeq ($(WINDOWS),true) else ifeq ($(WINDOWS),true)
EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion
endif endif
endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# Setup resources # Setup resources
@ -413,7 +405,6 @@ endif
# find . -type l | grep -v svg | grep -v ttf | grep -v art | grep -v json | grep -v png | grep -v otf | sort # find . -type l | grep -v svg | grep -v ttf | grep -v art | grep -v json | grep -v png | grep -v otf | sort
SYMLINKED_DIRS_RESOURCES = Fundamental/presets SYMLINKED_DIRS_RESOURCES = Fundamental/presets
ifneq ($(CARDINAL_VARIANT),mini) ifneq ($(CARDINAL_VARIANT),mini)
ifneq ($(NOPLUGINS),true)
SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/chopin SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/chopin
SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy
SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg
@ -436,7 +427,6 @@ SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables
SYMLINKED_DIRS_RESOURCES += surgext/patches SYMLINKED_DIRS_RESOURCES += surgext/patches
SYMLINKED_DIRS_RESOURCES += surgext/presets SYMLINKED_DIRS_RESOURCES += surgext/presets
endif endif
endif
LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d)) LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d))
else ifeq ($(HAIKU),true) else ifeq ($(HAIKU),true)