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

Get Qqqq modules to work

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-12-03 22:34:47 +00:00
parent a2bd1a6e83
commit b362a26149
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
deps/Makefile vendored
View file

@ -130,7 +130,7 @@ DEP_MAKE += DEP_MAC_SDK_FLAGS=
DEP_MAKE += MACHINE=$(MACHINE)$(MACHINE_SUFFIX)
# --------------------------------------------------------------
# VCV internal dependencies target
# Rack internal dependencies target
$(DEP_PATH)/lib/%.a:
$(DEP_MAKE) -C $(DEP_PATH) lib/$*.a
@ -176,10 +176,40 @@ $(DEP_PATH)/zstd-1.4.5/.stamp-patched:
sed -i -e "142,144d" $(DEP_PATH)/zstd-1.4.5/programs/util.c
touch $@
# --------------------------------------------------------------
# QuickJS target, needed for AriaModules
QUICKJS_MAKE_FLAGS = CFLAGS="$(BUILD_C_FLAGS) -D_GNU_SOURCE -DCONFIG_VERSION='\"Cardinal\"' -w"
QUICKJS_MAKE_FLAGS += PROGS=libquickjs.a
ifeq ($(WITH_LTO),true)
QUICKJS_MAKE_FLAGS += CONFIG_LTO=y
else
QUICKJS_MAKE_FLAGS += CONFIG_LTO=n
endif
ifeq ($(WINDOWS),true)
QUICKJS_MAKE_FLAGS += CONFIG_WIN32=y
else ifeq ($(MACOS),true)
QUICKJS_MAKE_FLAGS += CONFIG_DARWIN=y
endif
$(DEP_PATH)/lib/libquickjs.a: $(DEP_PATH)/QuickJS
$(DEP_MAKE) $(QUICKJS_MAKE_FLAGS) -C $(DEP_PATH)/QuickJS
install -d $(DEP_PATH)/include
install -d $(DEP_PATH)/lib
install -m644 $(DEP_PATH)/QuickJS/libquickjs.a $@
install -m644 $(DEP_PATH)/QuickJS/quickjs.h $(DEP_PATH)/include/quickjs.h
$(DEP_PATH)/QuickJS:
git clone "https://github.com/JerrySievert/QuickJS.git" $(DEP_PATH)/QuickJS
git -C $(DEP_PATH)/QuickJS checkout b70d5344013836544631c361ae20569b978176c9
# --------------------------------------------------------------
# Build targets
TARGETS += $(DEP_PATH)/lib/libjansson.a
TARGETS += $(DEP_PATH)/lib/libquickjs.a
TARGETS += $(DEP_PATH)/lib/libsamplerate.a
TARGETS += $(DEP_PATH)/lib/libspeexdsp.a
@ -206,5 +236,6 @@ clean:
rm -rf $(DEP_PATH)/libsamplerate-0.1.9
rm -rf $(DEP_PATH)/speexdsp-SpeexDSP-1.2rc3
rm -rf $(DEP_PATH)/zstd-1.4.5
rm -rf $(DEP_PATH)/QuickJS
# --------------------------------------------------------------

2
plugins/AriaModules

@ -1 +1 @@
Subproject commit 20d96fa86b7fff105de8892567bc2d2cf6c03fa2
Subproject commit 90f8009e1431341225c616bb3a9c250b02bce2c1

4
plugins/Makefile
View file

@ -210,9 +210,7 @@ PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp)
# --------------------------------------------------------------
# Aria
ARIA_TODO = Qqqq
PLUGIN_FILES += $(filter-out AriaModules/src/Arcane.cpp AriaModules/src/plugin.cpp $(ARIA_TODO:%=AriaModules/src/%.cpp),$(wildcard AriaModules/src/*.cpp))
PLUGIN_FILES += $(filter-out AriaModules/src/Arcane.cpp AriaModules/src/plugin.cpp,$(wildcard AriaModules/src/*.cpp))
# modules/types which are present in other plugins
ARIA_CUSTOM = Blank

8
plugins/plugins.cpp
View file

@ -582,12 +582,10 @@ static void initStatic__Aria()
p->addModel(modelSwerge);
p->addModel(modelSplirge);
// p->addModel(modelSrot);
/* TODO needs quickjs
p->addModel(modelQqqq);
p->addModel(modelQuack);
p->addModel(modelQ);
p->addModel(modelQuale);
*/
p->addModel(modelDarius);
p->addModel(modelSolomon4);
p->addModel(modelSolomon8);
@ -603,12 +601,6 @@ static void initStatic__Aria()
spl.removeModule("Arcane");
spl.removeModule("Atout");
spl.removeModule("Aleister");
// TODO build quickjs
spl.removeModule("Qqqq");
spl.removeModule("Quack");
spl.removeModule("Q");
spl.removeModule("Quale");
}
}

1
src/Makefile.cardinal.mk
View file

@ -96,6 +96,7 @@ RACK_EXTRA_LIBS += ../rack.a
ifneq ($(SYSDEPS),true)
RACK_EXTRA_LIBS += ../Rack/dep/lib/libjansson.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libquickjs.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libsamplerate.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libspeexdsp.a
ifeq ($(WINDOWS),true)