From 8650bb6308f259b97f19b60b7758c20bb00508df Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 22 Jan 2022 22:32:49 +0000 Subject: [PATCH] Add QuickJS as submodule instead of build-time download; Skip cf Signed-off-by: falkTX --- .gitmodules | 3 +++ deps/Makefile | 12 ++++-------- deps/QuickJS | 1 + plugins/Makefile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) create mode 160000 deps/QuickJS diff --git a/.gitmodules b/.gitmodules index 62f515e..a6b17b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -133,3 +133,6 @@ [submodule "plugins/ihtsyn"] path = plugins/ihtsyn url = https://github.com/CardinalModules/ihtsyn.git +[submodule "deps/QuickJS"] + path = deps/QuickJS + url = https://github.com/JerrySievert/QuickJS.git diff --git a/deps/Makefile b/deps/Makefile index 9f4fa0c..ca7bac9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -200,16 +200,12 @@ 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 +$(DEP_PATH)/lib/libquickjs.a: + $(DEP_MAKE) $(QUICKJS_MAKE_FLAGS) -C $(CURDIR)/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 + install -m644 $(CURDIR)/QuickJS/libquickjs.a $@ + install -m644 $(CURDIR)/QuickJS/quickjs.h $(DEP_PATH)/include/quickjs.h # -------------------------------------------------------------- # Build targets diff --git a/deps/QuickJS b/deps/QuickJS new file mode 160000 index 0000000..b70d534 --- /dev/null +++ b/deps/QuickJS @@ -0,0 +1 @@ +Subproject commit b70d5344013836544631c361ae20569b978176c9 diff --git a/plugins/Makefile b/plugins/Makefile index 531519b..743069c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -412,7 +412,7 @@ PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp) # -------------------------------------------------------------- # cf -PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp)) +# PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp)) # -------------------------------------------------------------- # DrumKit