From 1cc281b6a49ab4021be92fed7c2975c9d0fa9697 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 1 Jun 2020 08:20:23 -0500 Subject: py.mk: Assume we want all C files from ulab --- py/py.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'py') diff --git a/py/py.mk b/py/py.mk index a5c8a7dc6..f77e8a201 100644 --- a/py/py.mk +++ b/py/py.mk @@ -106,19 +106,7 @@ $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS) endif ifeq ($(CIRCUITPY_ULAB),1) -SRC_MOD += $(addprefix extmod/ulab/code/, \ -compare.c \ -create.c \ -extras.c \ -fft.c \ -filter.c \ -linalg.c \ -ndarray.c \ -numerical.c \ -poly.c \ -ulab.c \ -vectorise.c \ - ) +SRC_MOD += $(wildcard extmod/ulab/code/*.c) CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1 $(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-float-equal -Wno-sign-compare -DCIRCUITPY endif -- cgit v1.2.3 From f211a090e297a71a8a512487aa8a2051caecdc95 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 1 Jun 2020 08:26:23 -0500 Subject: py.mk: Assume we want all C source files in ulab --- py/py.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'py') diff --git a/py/py.mk b/py/py.mk index f77e8a201..3cb505920 100644 --- a/py/py.mk +++ b/py/py.mk @@ -106,7 +106,7 @@ $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS) endif ifeq ($(CIRCUITPY_ULAB),1) -SRC_MOD += $(wildcard extmod/ulab/code/*.c) +SRC_MOD += $(patsubst $(TOP)/%,%,$(wildcard $(TOP)/extmod/ulab/code/*.c)) CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1 $(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-float-equal -Wno-sign-compare -DCIRCUITPY endif -- cgit v1.2.3