djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:ladyada/circuitpython into main

Browse Source
This commit is contained in:
lady ada 2022-04-09 11:34:09 -04:00
commit 3699cc7663
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mpy-cross/mpy-cross.mk
View File

@ -6,12 +6,7 @@ include ../py/mkenv.mk
# define main target # define main target
ifeq ($(OS),Windows_NT)
# Detect a MINGW32 build, and change the name of the final executable.
PROG ?= mpy-cross PROG ?= mpy-cross
else
PROG ?= mpy-cross
endif
# qstr definitions (must come before including py.mk) # qstr definitions (must come before including py.mk)
QSTR_DEFS = qstrdefsport.h QSTR_DEFS = qstrdefsport.h

2
ports/espressif/Makefile
View File

@ -310,7 +310,7 @@ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED)
# IDF build commands # IDF build commands
IDF_PATH = "$(realpath ./esp-idf)" IDF_PATH = $(realpath ./esp-idf)
# create the directory # create the directory
$(BUILD)/esp-idf: $(BUILD)/esp-idf:
$(Q)$(MKDIR) -p $@ $(Q)$(MKDIR) -p $@