diff options
| author | Dan Halbert <halbert@halwitz.org> | 2021-02-11 18:50:02 -0500 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2021-02-11 18:50:02 -0500 |
| commit | f0564b49862eaef0b9752b62d80ef00e3e12a3ee (patch) | |
| tree | 79a48a30955bdc7ae4e1971135809a0593130417 /py/circuitpy_defns.mk | |
| parent | 1b7f3d11e73be5cb0f7a97a528fedad87624b97f (diff) | |
| parent | 206109763f3d8b8dc92a5f5bf1bfabb49ce9c7b7 (diff) | |
merge from upstream; complicated webusb merge
Diffstat (limited to 'py/circuitpy_defns.mk')
| -rw-r--r-- | py/circuitpy_defns.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 3ce7c0117..f907bf7ae 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -292,6 +292,9 @@ endif ifeq ($(CIRCUITPY_USB_MIDI),1) SRC_PATTERNS += usb_midi/% endif +ifeq ($(CIRCUITPY_USB_VENDOR),1) +SRC_PATTERNS += usb_vendor/% +endif ifeq ($(CIRCUITPY_USTACK),1) SRC_PATTERNS += ustack/% endif @@ -388,6 +391,7 @@ SRC_COMMON_HAL_ALL = \ socketpool/Socket.c \ ssl/__init__.c \ ssl/SSLContext.c \ + ssl/SSLSocket.c \ supervisor/Runtime.c \ supervisor/__init__.c \ watchdog/WatchDogMode.c \ |