Mercurial > mxe-octave

comparison src/gnuplot-1-fixes.patch @ 4472:0fdeee4cfe11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: enable Qt terminal and set default to wxt * src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin, install gnuplot_qt.exe * src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths * installer-files/octave-firsttime.vbs: set GNUTERM=wxt * installer-files/octave.vbs: set GNUTERM=wxt * installer-files/octave.bat: set GNUTERM=wxt * installer-files/cmdshell.bat: set GNUTERM=wxt
author Mike Miller <mtmiller@octave.org>
date Wed, 06 Sep 2017 16:19:37 -0700
parents c615db675618
children fc9edc9be940
comparison
equal deleted inserted replaced
4471:1a3deda73484 4472:0fdeee4cfe11
149 +# define GP_MATHERR matherr 149 +# define GP_MATHERR matherr
150 +# endif 150 +# endif
151 #endif 151 #endif
152 152
153 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H 153 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H
154 diff -ur gnuplot-5.0.7.orig/config/mingw/Makefile gnuplot-5.0.7/config/mingw/Makefile
155 --- gnuplot-5.0.7.orig/config/mingw/Makefile 2017-09-07 17:47:19.588554741 -0400
156 +++ gnuplot-5.0.7/config/mingw/Makefile 2017-09-07 17:52:11.565785085 -0400
157 @@ -468,10 +468,11 @@
158 moc_QtGnuplotWidget.o moc_QtGnuplotScene.o \
159 moc_QtGnuplotEvent.o qrc_QtGnuplotResource.o
160 #
161 - MOC = $(QT_DIR)/bin/moc
162 - UIC = $(QT_DIR)/bin/uic
163 - RCC = $(QT_DIR)/bin/rcc
164 - LRELEASE = $(QT_DIR)/bin/lrelease
165 + QT_BIN_DIR ?= $(QT_DIR)/bin
166 + MOC ?= $(QT_BIN_DIR)/moc
167 + UIC ?= $(QT_BIN_DIR)/uic
168 + RCC ?= $(QT_BIN_DIR)/rcc
169 + LRELEASE ?= $(QT_BIN_DIR)/lrelease
170 QT_FILES_TARGETS = qrc_QtGnuplotResource.cpp ui_QtGnuplotSettings.h moc_QtGnuplotWindow.cpp moc_QtGnuplotApplication.cpp
171 QT_FILES_TARGETS += moc_QtGnuplotWidget.cpp moc_QtGnuplotScene.cpp moc_QtGnuplotEvent.cpp
172 QT_TRANSLATION = qtgnuplot_fr.qm qtgnuplot_ja.qm