From e94779a3fa990e1ebf4c113ad8ecb59fe0583c62 Mon Sep 17 00:00:00 2001 From: clwe Date: Mon, 6 Jul 2020 18:24:25 +0200 Subject: [PATCH] merges Makefile to integrate VULT --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a4f38df..93c7b6b 100644 --- a/Makefile +++ b/Makefile @@ -14,12 +14,19 @@ DISTRIBUTABLES += $(wildcard LICENSE*) include $(RACK_DIR)/arch.mk DUKTAPE ?= 0 -QUICKJS ?= 0 +QUICKJS ?= 1 LUAJIT ?= 1 PYTHON ?= 0 SUPERCOLLIDER ?= 0 +VULT ?= 1 LIBPD ?= 1 +# Vult depends on both LuaJIT and QuickJS +ifeq ($(VULT), 1) +QUICKJS := 1 +LUAJIT := 1 +endif + # Entropia File System Watcher efsw := dep/lib/libefsw-static-release.a DEPS += $(efsw) @@ -83,7 +90,6 @@ endif $(quickjs): cd dep && git clone "https://github.com/JerrySievert/QuickJS.git" cd dep/QuickJS && git checkout 807adc8ca9010502853d471bd8331cdc1d376b94 - cd dep/QuickJS && $(MAKE) $(QUICKJS_MAKE_FLAGS) cd dep/QuickJS && $(MAKE) $(QUICKJS_MAKE_FLAGS) install endif