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

windows: Remove remaining traces of old GNU readline support.

Browse Source 
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.
This commit is contained in:
Damien George 2018-12-15 13:54:55 +11:00
parent 5146e79490
commit 0c46419323
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/windows/Makefile
View File

@ -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

2
ports/windows/mpconfigport.h
View File

@ -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

4
ports/windows/mpconfigport.mk
View File

@ -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)