diff options
| author | Lucian Copeland <hierophect@gmail.com> | 2020-03-26 18:16:11 -0400 |
|---|---|---|
| committer | Lucian Copeland <hierophect@gmail.com> | 2020-03-26 18:16:11 -0400 |
| commit | 348df4be2ba1bfc00a7bfab4f0de35beea78a407 (patch) | |
| tree | e2c588b3abe40afc7b971f0ca7059a01bd2dac9c /py/py.mk | |
| parent | c4db8b87e2c57ca94b8f76e4b07ca02641df714e (diff) | |
| parent | aec3b2419b2c52f6f42249207cfe2b6de5d58f61 (diff) | |
Merge remote-tracking branch 'upstream/master' into stm32x7-setup
Diffstat (limited to 'py/py.mk')
| -rw-r--r-- | py/py.mk | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -105,9 +105,10 @@ $(BUILD)/$(BTREE_DIR)/%.o: CFLAGS += -Wno-old-style-definition -Wno-sign-compare $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS) endif -ifeq ($(MICROPY_PY_ULAB),1) +ifeq ($(CIRCUITPY_ULAB),1) SRC_MOD += $(addprefix extmod/ulab/code/, \ create.c \ +extras.c \ fft.c \ filter.c \ linalg.c \ @@ -117,7 +118,7 @@ poly.c \ ulab.c \ vectorise.c \ ) -CFLAGS_MOD += -DMICROPY_PY_ULAB=1 -DMODULE_ULAB_ENABLED=1 +CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1 $(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-sign-compare -Wno-missing-prototypes -Wno-unused-parameter -Wno-missing-declarations -Wno-error -Wno-shadow -Wno-maybe-uninitialized -DCIRCUITPY endif |