Mercurial > mxe-octave
changeset 3319:2636b3458f4d
* src/msvc-octave-1.patch: Update to octave 3.7.7.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Tue, 12 Nov 2013 20:54:29 -0500 |
| parents | 2640cb06f42d |
| children | f301bfef765d |
| files | src/msvc-octave-1.patch |
| diffstat | 1 files changed, 6 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/msvc-octave-1.patch Tue Nov 12 20:53:52 2013 -0500 +++ b/src/msvc-octave-1.patch Tue Nov 12 20:54:29 2013 -0500 @@ -7,9 +7,9 @@ LLVM_CXXFLAGS= - LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" + LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags`" - LLVM_LIBS=`$LLVM_CONFIG --libs` + - dnl + LDFLAGS="$LDFLAGS $LLVM_LDFLAGS" @@ -1186,7 +1186,7 @@ XTRA_CRUFT_SH_LDFLAGS= if test $have_msvc = yes; then @@ -19,19 +19,6 @@ fi AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) -diff -ur octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp octave-3.7.5/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp ---- octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp 2013-05-13 05:58:35 -0400 -+++ octave-3.7.5/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp 2013-07-18 11:28:12 -0400 -@@ -40,7 +40,9 @@ - #include <stdio.h> - #include <stdarg.h> - #define WIN32_LEAN_AND_MEAN -+#if ! defined (_WIN32_WINNT) && ! defined (NTDDI_VERSION) - #define _WIN32_WINNT 0x0500 -+#endif - #include <windows.h> - #include <cstring> - #include <csignal> diff -ur octave-3.7.5-orig/libgui/qterminal-module.mk octave-3.7.5/libgui/qterminal-module.mk --- octave-3.7.5-orig/libgui/qterminal-module.mk 2013-05-12 15:01:12 -0400 +++ octave-3.7.5/libgui/qterminal-module.mk 2013-07-18 11:27:26 -0400 @@ -60,8 +47,8 @@ --- octave-3.7.5-orig/libinterp/Makefile.am 2013-04-16 11:26:09 -0400 +++ octave-3.7.5/libinterp/Makefile.am 2013-07-18 11:27:26 -0400 @@ -185,6 +185,7 @@ - interpfcn/libinterpfcn.la \ corefcn/libcorefcn.la \ + corefcn/libtex_parser.la \ $(top_builddir)/liboctave/liboctave.la \ + $(top_builddir)/libgnu/libgnu.la \ $(LIBOCTINTERP_LINK_DEPS) @@ -246,9 +233,9 @@ basename, libraries[i]); } } -diff -ur octave-3.7.5-orig/libinterp/interpfcn/graphics.cc octave-3.7.5/libinterp/interpfcn/graphics.cc ---- octave-3.7.5-orig/libinterp/interpfcn/graphics.cc 2013-04-16 11:26:09 -0400 -+++ octave-3.7.5/libinterp/interpfcn/graphics.cc 2013-07-18 11:27:26 -0400 +diff -ur octave-3.7.5-orig/libinterp/corefcn/graphics.cc octave-3.7.5/libinterp/corefcn/graphics.cc +--- octave-3.7.5-orig/libinterp/corefcn/graphics.cc 2013-04-16 11:26:09 -0400 ++++ octave-3.7.5/libinterp/corefcn/graphics.cc 2013-07-18 11:27:26 -0400 @@ -10304,7 +10304,11 @@ break; }