Browse Source

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

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
8650bb6308
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 9 additions and 9 deletions
  1. +3
    -0
      .gitmodules
  2. +4
    -8
      deps/Makefile
  3. +1
    -0
      deps/QuickJS
  4. +1
    -1
      plugins/Makefile

+ 3
- 0
.gitmodules View File

@@ -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

+ 4
- 8
deps/Makefile View File

@@ -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


+ 1
- 0
deps/QuickJS

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

+ 1
- 1
plugins/Makefile View File

@@ -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


Loading…
Cancel
Save