Mercurial > mxe-octave

comparison src/gnuplot-1-fixes.patch @ 4297:8f864b4ea93b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: enable wx terminal type * src/gnuplot-1-fixes.patch: patch updated * src/gnuplot.mk: update extra flags for wxwidgets
author John D
date Wed, 28 Dec 2016 14:49:14 -0500
parents 851b9f4a6b1c
children 16d2b997c31b
comparison
equal deleted inserted replaced
4296:68c7e187e20d 4297:8f864b4ea93b
121 +# define GP_MATHERR matherr 121 +# define GP_MATHERR matherr
122 +#endif 122 +#endif
123 #endif 123 #endif
124 124
125 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H 125 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H
126 diff -ur gnuplot-5.0.4.orig/config/mingw/Makefile gnuplot-5.0.4/config/mingw/Makefile
127 --- gnuplot-5.0.4.orig/config/mingw/Makefile 2016-12-27 08:55:41.906600912 -0500
128 +++ gnuplot-5.0.4/config/mingw/Makefile 2016-12-27 08:57:30.033448266 -0500
129 @@ -101,6 +101,7 @@
130 # Uncomment the following lines to compile it.
131 #WXT=1
132 #CAIROLIBS=1
133 +WX_CONFIG ?= wx-config
134
135 # Build qt terminal?
136 #QT = 1
137 @@ -422,9 +423,9 @@
138
139 ifdef WXT
140 CFLAGS += -DWXWIDGETS
141 - WXT_CXXFLAGS := $(shell wx-config --cxxflags)
142 + WXT_CXXFLAGS := $(shell $(WX_CONFIG) --cxxflags)
143 CXXFLAGS += $(WXT_CXXFLAGS)
144 - WX_LIBS := $(shell wx-config --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g")
145 + WX_LIBS := $(shell $(WX_CONFIG) --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g")
146 WX_OBJS = wxt_gui.$(O)
147 endif
148
149 diff -ur gnuplot-5.0.4.orig/src/wxterminal/wxt_gui.h gnuplot-5.0.4/src/wxterminal/wxt_gui.h
150 --- gnuplot-5.0.4.orig/src/wxterminal/wxt_gui.h 2016-12-27 12:29:33.624151543 -0500
151 +++ gnuplot-5.0.4/src/wxterminal/wxt_gui.h 2016-12-27 12:30:09.419977685 -0500
152 @@ -174,7 +174,7 @@
153 # ifndef _WIN32_WINNT
154 # define _WIN32_WINNT 0x0500
155 # endif
156 -# include "Windows.h"
157 +# include "windows.h"
158 # include "win/wtext.h"
159 # include "win/winmain.h"
160 # endif
161 diff -ur gnuplot-5.0.4.orig/config/mingw/Makefile gnuplot-5.0.4/config/mingw/Makefile
162 --- gnuplot-5.0.4.orig/config/mingw/Makefile 2016-12-27 12:42:32.612130064 -0500
163 +++ gnuplot-5.0.4/config/mingw/Makefile 2016-12-27 12:43:31.994500570 -0500
164 @@ -108,9 +108,9 @@
165 # specify QT installation directory
166 #QT_DIR = /c/Qt/5.2.1/mingw48_32
167 ifndef MINGW64
168 -QT_DIR = /d/Source/Qt-5.2.1-mingw/5.2.1/mingw48_32
169 +QT_DIR ?= /d/Source/Qt-5.2.1-mingw/5.2.1/mingw48_32
170 else
171 -QT_DIR = /mingw64
172 +QT_DIR ?= /mingw64
173 endif
174
175 # Uncomment the following line to select the lua/tikz terminal