Mercurial > mxe-octave
changeset 3152:4ce61d3172f0
[MSVC] align readline behavior to MinGW, remove _MSC_VER specifics
- fix DLL prefix to avoid double "lib"
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 18 Jul 2013 19:33:03 -0400 |
| parents | 2069703f3826 |
| children | d1231b6c2b34 |
| files | src/msvc-readline-1.patch src/readline-1-binding.patch src/readline-1-display.patch |
| diffstat | 3 files changed, 3 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/msvc-readline-1.patch Thu Jul 18 16:19:54 2013 -0400 +++ b/src/msvc-readline-1.patch Thu Jul 18 19:33:03 2013 -0400 @@ -1547,7 +1547,7 @@ + VCLIBNAME=`echo ${LIBNAME} | sed -e 's,\.dll,\.lib,'` IMPLIBNAME=`echo ${LIBNAME} \ - | sed -e 's,^cyg,lib,' -e 's,[0-9]*.dll$,.dll.a,'` -+ | sed -e 's,^@@LIBRARY_PREFIX@@lib,,' -e 's,-[0-9]*@@LIBRARY_SUFFIX@@.dll$,.lib,'` ++ | sed -e 's,^@@LIBRARY_PREFIX@@,,' -e 's,-[0-9]*@@LIBRARY_SUFFIX@@.dll$,.lib,'` if [ -z "$uninstall" ]; then ${echo} $RM ${BINDIR}/${LIBNAME}.${OLDSUFF} if [ -f "$BINDIR/$LIBNAME" ]; then @@ -1569,7 +1569,7 @@ SHOBJ_LD='$(CC)' - SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' + SHOBJ_LDFLAGS='-shared' -+ SHLIB_LIBPREF='@@LIBRARY_PREFIX@@lib' ++ SHLIB_LIBPREF='@@LIBRARY_PREFIX@@' SHLIB_LIBSUFF='dll' - SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)' + SHLIB_LIBVERSION='-$(SHLIB_DLLVERSION)@@LIBRARY_SUFFIX@@.$(SHLIB_LIBSUFF)'
--- a/src/readline-1-binding.patch Thu Jul 18 16:19:54 2013 -0400 +++ b/src/readline-1-binding.patch Thu Jul 18 19:33:03 2013 -0400 @@ -1,12 +1,7 @@ diff -uNr a/readline.c b/readline.c --- a/readline.c 2010-07-25 17:07:40.000000000 -0400 +++ b/readline.c 2013-04-17 20:38:42.637674309 -0400 -@@ -1154,11 +1159,14 @@ - rl_bind_keyseq_if_unbound ("\033OH", rl_beg_of_line); - rl_bind_keyseq_if_unbound ("\033OF", rl_end_of_line); - --#if defined (__MINGW32__) -+#if defined (__MINGW32__) && ! defined (_MSC_VER) +@@ -1158,7 +1163,10 @@ rl_bind_keyseq_if_unbound ("\340H", rl_get_previous_history); rl_bind_keyseq_if_unbound ("\340P", rl_get_next_history); rl_bind_keyseq_if_unbound ("\340M", rl_forward_char);
--- a/src/readline-1-display.patch Thu Jul 18 16:19:54 2013 -0400 +++ b/src/readline-1-display.patch Thu Jul 18 19:33:03 2013 -0400 @@ -107,21 +107,3 @@ if (_rl_term_clrpag) tputs (_rl_term_clrpag, 1, _rl_output_character_function); else -@@ -2353,7 +2424,7 @@ - char *string; - int count, col; - { --#if defined (__MSDOS__) || defined (__MINGW32__) -+#if defined (__MSDOS__) || (defined (__MINGW32__) && !defined (_MSC_VER)) - _rl_output_some_chars (string, count); - #else - /* DEBUGGING */ -@@ -2405,7 +2476,7 @@ - if (count > _rl_screenwidth) /* XXX */ - return; - --#if !defined (__MSDOS__) && !defined (__MINGW32__) -+#if (!defined (__MSDOS__) && !defined (__MINGW32__)) || defined (_MSC_VER) - if (_rl_term_DC && *_rl_term_DC) - { - char *buffer;