Mercurial > mxe-octave
annotate src/gnuplot-1-fixes.patch @ 3725:2acaa9943159
qscintilla: update 2.8.4
* src/qscintilla.mk: update to version and checksum for 2.8.4
author | John Donoghue |
---|---|
date | Mon, 20 Oct 2014 11:01:00 -0400 |
parents | 53c8b9c843c6 |
children | a397ccee4b57 |
rev | line source |
---|---|
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
1 diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile |
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
2 --- gnuplot-4.6.4.orig/config/mingw/Makefile 2013-11-04 18:26:55.000000000 -0500 |
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
3 +++ gnuplot-4.6.4/config/mingw/Makefile 2013-11-04 18:28:37.000000000 -0500 |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 @@ -27,7 +27,7 @@ |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 # Use more modern HTML help instead of no longer supported Windows help system |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 # Please update the HHWPATH below if necessary. |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 -HTML_HELP=1 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 +#HTML_HELP=1 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 # GIF, PNG, JPEG device drivers |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 # Requires gd library. There are two possibilities how to configure these |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 @@ -127,29 +127,29 @@ |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 # -mpentiumpro means optimize for Pentium II and Pro procesors |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 #CFLAGS += |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 -ifdef HTML_HELP |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 - |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 -# To compile the .chm file you need the Microsoft HTML Help 1.4 SDK |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 -# It can be obtained here: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 -# http://go.microsoft.com/fwlink/?LinkId=154968 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 -# We need to explicitly set the correct path here since we also need |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 -# adjust the include and linrary paths. |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 -HHC = $(HHWPATH)hhc |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 +# ifdef HTML_HELP |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 -else |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 +# # To compile the .chm file you need the Microsoft HTML Help 1.4 SDK |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 +# # It can be obtained here: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 +# # http://go.microsoft.com/fwlink/?LinkId=154968 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 +# # We need to explicitly set the correct path here since we also need |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 +# # adjust the include and linrary paths. |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 +# HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 +# HHC = $(HHWPATH)hhc |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 + |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
37 +# else |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 + |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 +# # To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 +# # Workshop. The latter can be obtained from either of |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 +# # ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 +# # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 +# # Put the path to hcw here unless it is already in PATH: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
44 +# HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 +# HCW = $(HCWPATH)hcw |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 +# # Switches are for HCW 4.03: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 +# HCWFLAG = |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
48 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 -# To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 -# Workshop. The latter can be obtained from either of |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
51 -# ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 -# http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
53 -# Put the path to hcw here unless it is already in PATH: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
54 -HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
55 -HCW = $(HCWPATH)hcw |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
56 -# Switches are for HCW 4.03: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
57 -HCWFLAG = |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
58 - |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
59 -endif |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 +# endif |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
61 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
62 # Choose which windres/rc do you want to use (GNU windres or MS RC): |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
63 GNU_RC = 1 |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
64 @@ -401,7 +401,7 @@ |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
65 RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O) |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
66 endif |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
67 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
68 -default: $(TARGET) $(MENUFILE) support |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
69 +default: $(TARGET) $(MENUFILE) # support |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
70 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
71 console: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
72 $(MAKE) TARGET=gnuplot.exe gnuplot.exe |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
73 @@ -443,7 +443,7 @@ |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
74 LDFLAGS2 += -L$(HHWPATH)lib |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
75 endif |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
76 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
77 -$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) texticon.ico grpicon.ico |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
78 +$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) TEXTICON.ico GRPICON.ico |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
79 $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\ |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
80 $(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS) |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
81 |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
82 @@ -458,7 +458,7 @@ |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
83 |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
84 # explicit rules |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
85 |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
86 -wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico |
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
87 +wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
88 $(RC) $(RCFLAGS) $< $(RCOUT) |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
89 $(RES2COFF) |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
90 |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
91 @@ -494,13 +494,13 @@ |
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
92 $(CC) -c $(CFLAGS) $(CXXFLAGS) $(PANGOCAIRO_CFLAGS) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
93 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
94 # extract icons from wgnuplot.rc |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
95 -texticon.ico: grpicon.ico |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
96 +TEXTICON.ico: GRPICON.ico |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
97 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
98 -grpicon.ico: geticon.exe $(W)/wgnuplot.rc |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
99 +GRPICON.ico: geticon $(W)/wgnuplot.rc |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
100 ./geticon $(W)/wgnuplot.rc |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
101 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
102 -geticon.exe: $(W)/geticon.c |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
103 - $(LD) $(LDFLAGS) -o $@ $< |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
104 +geticon: $(W)/geticon.c |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
105 + gcc -o $@ $< |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
106 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
107 ifdef HTML_HELP |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
108 # convert gnuplot.doc to windows/wgnuplot.html |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
109 @@ -703,7 +703,7 @@ |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
110 $(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
111 $(RM) *.$(O) *.po *.o *.co *.d |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
112 $(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
113 - $(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
114 + $(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
115 $(RM) *.aux *.log *.dvi *.toc |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
116 $(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
117 $(RM) titlepag.tex toc_entr.sty VERSION |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
118 @@ -802,7 +802,7 @@ |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
119 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
120 installer: |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
121 $(MAKE) DESTDIR=./dist install |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
122 - cp -p grpicon.ico ./dist/bin/ |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
123 + cp -p GRPICON.ico ./dist/bin/ |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
124 cp -p $(TOP)/win/*.iss ./dist |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
125 (cd ./dist; $(ISCC) gnuplot.iss) |
3281
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
126 ifdef RELEASE |
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
127 diff -ur gnuplot-4.6.4.orig/src/win/wgnuplot.rc gnuplot-4.6.4/src/win/wgnuplot.rc |
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
128 --- gnuplot-4.6.4.orig/src/win/wgnuplot.rc 2013-11-04 18:26:55.000000000 -0500 |
53c8b9c843c6
Update gnuplot to 4.6.4
John Donoghue <john.donoghue@ieee.org>
parents:
2891
diff
changeset
|
129 +++ gnuplot-4.6.4/src/win/wgnuplot.rc 2013-11-04 18:27:15.000000000 -0500 |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
130 @@ -15,8 +15,8 @@ |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
131 * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
132 */ |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
133 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
134 -GRPICON ICON "grpicon.ico" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
135 -TEXTICON ICON "texticon.ico" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
136 +GRPICON ICON "GRPICON.ico" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
137 +TEXTICON ICON "TEXTICON.ico" |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
138 |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
139 #else |
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
140 /* using Borland BRC.EXE */ |