aboutsummaryrefslogtreecommitdiff
path: root/py/py.mk
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2017-08-23 14:05:59 -0400
committerScott Shawcroft <scott@tannewt.org>2017-08-23 11:05:59 -0700
commit74cfdeb316420a3732370a5e19a6822c52395384 (patch)
tree8b719c40f2b52e5fe654d490e5ca4bdb4858717a /py/py.mk
parent16ef611b0bd9e76583b0a7e761d8ac2e00c8ff6d (diff)
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
Diffstat (limited to 'py/py.mk')
-rw-r--r--py/py.mk9
1 files changed, 6 insertions, 3 deletions
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