From 69c9a76786a584c716e26e6874cc778468d5d8c2 Mon Sep 17 00:00:00 2001 From: Andrew Leech Date: Thu, 25 Nov 2021 11:44:21 +1100 Subject: [PATCH 1/3] windows/mingw: Include extmod/shared/lib sources properly. --- ports/windows/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/windows/Makefile b/ports/windows/Makefile index 4aceeb981ce53..5a22be4642b55 100644 --- a/ports/windows/Makefile +++ b/ports/windows/Makefile @@ -61,7 +61,18 @@ SRC_C = \ $(SRC_MOD) \ $(wildcard $(VARIANT_DIR)/*.c) +SHARED_SRC_C += $(addprefix shared/,\ + $(SHARED_SRC_C_EXTRA) \ + ) + +SRC_CXX += \ + $(SRC_MOD_CXX) + OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) +OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o)) +OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o)) +OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o)) +OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) ifeq ($(MICROPY_USE_READLINE),1) CFLAGS_MOD += -DMICROPY_USE_READLINE=1 @@ -71,7 +82,7 @@ endif LIB += -lws2_32 # List of sources for qstr extraction -SRC_QSTR += $(SRC_C) +SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C) # Append any auto-generated sources that are needed by sources listed in # SRC_QSTR SRC_QSTR_AUTO_DEPS += From c708262c12cdf9b465e7007cc33cca7044310fcb Mon Sep 17 00:00:00 2001 From: Andrew Leech Date: Thu, 25 Nov 2021 12:09:40 +1100 Subject: [PATCH 2/3] windows/uselect: Enable micropython select in dev variant. --- ports/windows/msvc/sources.props | 1 + ports/windows/variants/dev/mpconfigvariant.h | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props index 5bf0fc453dba6..228a96d81e3f0 100644 --- a/ports/windows/msvc/sources.props +++ b/ports/windows/msvc/sources.props @@ -14,6 +14,7 @@ + diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h index 1f205066f0f09..09ee689dafaf7 100644 --- a/ports/windows/variants/dev/mpconfigvariant.h +++ b/ports/windows/variants/dev/mpconfigvariant.h @@ -36,3 +36,4 @@ #define MICROPY_COMP_CONST (0) #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) #define MICROPY_PY_BUILTINS_SLICE_INDICES (1) +#define MICROPY_PY_USELECT (1) From 6f7d6c567f8862e0893da7fd08bd828cc6d054cf Mon Sep 17 00:00:00 2001 From: Andrew Leech Date: Mon, 7 Feb 2022 14:38:53 +1100 Subject: [PATCH 3/3] windows/uasyncio: Add support for uasyncio to windows dev variant. --- ports/windows/msvc/sources.props | 1 + ports/windows/variants/dev/manifest.py | 1 + ports/windows/variants/dev/mpconfigvariant.h | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props index 228a96d81e3f0..e5109eecc8c0c 100644 --- a/ports/windows/msvc/sources.props +++ b/ports/windows/msvc/sources.props @@ -7,6 +7,7 @@ + diff --git a/ports/windows/variants/dev/manifest.py b/ports/windows/variants/dev/manifest.py index 08295fc678d02..88a6937b4fb36 100644 --- a/ports/windows/variants/dev/manifest.py +++ b/ports/windows/variants/dev/manifest.py @@ -1 +1,2 @@ include("$(PORT_DIR)/variants/manifest.py") +include("$(MPY_DIR)/extmod/uasyncio/manifest.py") diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h index 09ee689dafaf7..abf43a0da92ac 100644 --- a/ports/windows/variants/dev/mpconfigvariant.h +++ b/ports/windows/variants/dev/mpconfigvariant.h @@ -37,3 +37,7 @@ #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) #define MICROPY_PY_BUILTINS_SLICE_INDICES (1) #define MICROPY_PY_USELECT (1) + +#ifndef MICROPY_PY_UASYNCIO +#define MICROPY_PY_UASYNCIO (1) +#endif pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy