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

Add QuickJS as submodule instead of build-time download; Skip cf

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-01-22 22:32:49 +00:00
parent b50783ccc8
commit 8650bb6308
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -133,3 +133,6 @@
[submodule "plugins/ihtsyn"] [submodule "plugins/ihtsyn"]
path = plugins/ihtsyn path = plugins/ihtsyn
url = https://github.com/CardinalModules/ihtsyn.git url = https://github.com/CardinalModules/ihtsyn.git
[submodule "deps/QuickJS"]
path = deps/QuickJS
url = https://github.com/JerrySievert/QuickJS.git

12
deps/Makefile vendored
View file

@ -200,16 +200,12 @@ else ifeq ($(MACOS),true)
QUICKJS_MAKE_FLAGS += CONFIG_DARWIN=y QUICKJS_MAKE_FLAGS += CONFIG_DARWIN=y
endif endif
$(DEP_PATH)/lib/libquickjs.a: $(DEP_PATH)/QuickJS $(DEP_PATH)/lib/libquickjs.a:
$(DEP_MAKE) $(QUICKJS_MAKE_FLAGS) -C $(DEP_PATH)/QuickJS $(DEP_MAKE) $(QUICKJS_MAKE_FLAGS) -C $(CURDIR)/QuickJS
install -d $(DEP_PATH)/include install -d $(DEP_PATH)/include
install -d $(DEP_PATH)/lib install -d $(DEP_PATH)/lib
install -m644 $(DEP_PATH)/QuickJS/libquickjs.a $@ install -m644 $(CURDIR)/QuickJS/libquickjs.a $@
install -m644 $(DEP_PATH)/QuickJS/quickjs.h $(DEP_PATH)/include/quickjs.h install -m644 $(CURDIR)/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 # Build targets

1
deps/QuickJS vendored Submodule

@ -0,0 +1 @@
Subproject commit b70d5344013836544631c361ae20569b978176c9

2
plugins/Makefile
View file

@ -412,7 +412,7 @@ PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp)
# -------------------------------------------------------------- # --------------------------------------------------------------
# cf # 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 # DrumKit