diff options
| author | Damien George <damien.p.george@gmail.com> | 2018-12-15 13:54:55 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2018-12-15 13:54:55 +1100 |
| commit | 0c46419323f95ac406749ec317eaeaae4e460242 (patch) | |
| tree | 785bb4a131a1cb155c447a2d9c6a27da130eb900 | |
| parent | 5146e7949028928a1f5e8f5705c0600fcb39ed74 (diff) | |
windows: Remove remaining traces of old GNU readline support.
GNU readline support for the unix port was removed in
acaa30b6046d449f5f58a8f02c83459702759df7 and in
5e83a75c78dc8c370b25e7ee669295854ea45130, so it's also no longer supported
in the windows port.
| -rw-r--r-- | ports/windows/Makefile | 3 | ||||
| -rw-r--r-- | ports/windows/mpconfigport.h | 2 | ||||
| -rw-r--r-- | ports/windows/mpconfigport.mk | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ports/windows/Makefile b/ports/windows/Makefile index 61a6b2844..88d103e7b 100644 --- a/ports/windows/Makefile +++ b/ports/windows/Makefile @@ -46,9 +46,6 @@ OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) ifeq ($(MICROPY_USE_READLINE),1) CFLAGS_MOD += -DMICROPY_USE_READLINE=1 SRC_C += lib/mp-readline/readline.c -else ifeq ($(MICROPY_USE_READLINE),2) -CFLAGS_MOD += -DMICROPY_USE_READLINE=2 -LDFLAGS_MOD += -lreadline endif LIB += -lws2_32 diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h index 03af97b95..81464d72a 100644 --- a/ports/windows/mpconfigport.h +++ b/ports/windows/mpconfigport.h @@ -26,7 +26,7 @@ // options to control how MicroPython is built -// Linking with GNU readline (MICROPY_USE_READLINE == 2) causes binary to be licensed under GPL +// By default use MicroPython version of readline #ifndef MICROPY_USE_READLINE #define MICROPY_USE_READLINE (1) #endif diff --git a/ports/windows/mpconfigport.mk b/ports/windows/mpconfigport.mk index 87001d464..a2c618f14 100644 --- a/ports/windows/mpconfigport.mk +++ b/ports/windows/mpconfigport.mk @@ -3,7 +3,9 @@ # Build 32-bit binaries on a 64-bit host MICROPY_FORCE_32BIT = 0 -# Linking with GNU readline causes binary to be licensed under GPL +# This variable can take the following values: +# 0 - no readline, just simple stdin input +# 1 - use MicroPython version of readline MICROPY_USE_READLINE = 1 # ffi module requires libffi (libffi-dev Debian package) |