From 74cfdeb316420a3732370a5e19a6822c52395384 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 23 Aug 2017 14:05:59 -0400 Subject: Added ability to freeze multiple directories; freeze neopixel library in cpx build (#199) Reworked frozen module support: clean up makefiles and handle multiple directories. Modules to freeze are included as git submodules. Add neopixel to circuitplayground express build. Fixes #56 --- py/py.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'py/py.mk') diff --git a/py/py.mk b/py/py.mk index 70891677d..22826b1f4 100644 --- a/py/py.mk +++ b/py/py.mk @@ -247,12 +247,15 @@ PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) # object file for frozen files ifneq ($(FROZEN_DIR),) -PY_O += $(BUILD)/$(BUILD)/frozen.o +PY_O += $(BUILD)/frozen.o endif +# Combine old singular FROZEN_MPY_DIR with new multiple value form. +FROZEN_MPY_DIRS += $(FROZEN_MPY_DIR) + # object file for frozen bytecode (frozen .mpy files) -ifneq ($(FROZEN_MPY_DIR),) -PY_O += $(BUILD)/$(BUILD)/frozen_mpy.o +ifneq ($(FROZEN_MPY_DIRS),) +PY_O += $(BUILD)/frozen_mpy.o endif # Sources that may contain qstrings -- cgit v1.2.3