Mercurial > mxe-octave

comparison src/gnuplot-1-fixes.patch @ 2891:848118c648ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include gnuplot as a dependency of Octave
author John W. Eaton <jwe@octave.org>
date Mon, 03 Dec 2012 09:15:05 -0500
parents
children 53c8b9c843c6
comparison
equal deleted inserted replaced
2890:152e3e693568 2891:848118c648ae
1 --- a/config/mingw/Makefile 2012-11-30 16:52:35.622821917 -0500
2 +++ b/config/mingw/Makefile 2012-11-30 16:52:23.071255685 -0500
3 @@ -27,7 +27,7 @@
4
5 # Use more modern HTML help instead of no longer supported Windows help system
6 # Please update the HHWPATH below if necessary.
7 -HTML_HELP=1
8 +#HTML_HELP=1
9
10 # GIF, PNG, JPEG device drivers
11 # Requires gd library. There are two possibilities how to configure these
12 @@ -127,29 +127,29 @@
13 # -mpentiumpro means optimize for Pentium II and Pro procesors
14 #CFLAGS +=
15
16 -ifdef HTML_HELP
17 -
18 -# To compile the .chm file you need the Microsoft HTML Help 1.4 SDK
19 -# It can be obtained here:
20 -# http://go.microsoft.com/fwlink/?LinkId=154968
21 -# We need to explicitly set the correct path here since we also need
22 -# adjust the include and linrary paths.
23 -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/"
24 -HHC = $(HHWPATH)hhc
25 +# ifdef HTML_HELP
26
27 -else
28 +# # To compile the .chm file you need the Microsoft HTML Help 1.4 SDK
29 +# # It can be obtained here:
30 +# # http://go.microsoft.com/fwlink/?LinkId=154968
31 +# # We need to explicitly set the correct path here since we also need
32 +# # adjust the include and linrary paths.
33 +# HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/"
34 +# HHC = $(HHWPATH)hhc
35 +
36 +# else
37 +
38 +# # To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help
39 +# # Workshop. The latter can be obtained from either of
40 +# # ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe
41 +# # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098
42 +# # Put the path to hcw here unless it is already in PATH:
43 +# HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/"
44 +# HCW = $(HCWPATH)hcw
45 +# # Switches are for HCW 4.03:
46 +# HCWFLAG =
47
48 -# To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help
49 -# Workshop. The latter can be obtained from either of
50 -# ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe
51 -# http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098
52 -# Put the path to hcw here unless it is already in PATH:
53 -HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/"
54 -HCW = $(HCWPATH)hcw
55 -# Switches are for HCW 4.03:
56 -HCWFLAG =
57 -
58 -endif
59 +# endif
60
61 # Choose which windres/rc do you want to use (GNU windres or MS RC):
62 GNU_RC = 1
63 @@ -397,7 +397,7 @@
64 RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O)
65 endif
66
67 -default: $(TARGET) $(MENUFILE) support
68 +default: $(TARGET) $(MENUFILE) # support
69
70 console:
71 $(MAKE) TARGET=gnuplot.exe gnuplot.exe
72 @@ -433,7 +433,7 @@
73 $(W)/winmain.c $(W)/wmenu.c $(W)/wpause.c $(W)/wprinter.c \
74 $(W)/wresourc.h $(W)/wtext.c $(W)/wtext.h $(W)/geticon.c \
75 $(W)/screenbuf.c $(W)/screenbuf.h $(W)/wgdiplus.cpp $(W)/wgdiplus.h \
76 - $(D)doc2rtf.c $(T)win.trm $(W)/grpicon.ico $(W)/texticon.ico
77 + $(D)doc2rtf.c $(T)win.trm $(W)/GRPICON.ico $(W)/TEXTICON.ico
78
79 ifdef HTML_HELP
80 WINDOWS += $(D)windows/doc2html.c
81 @@ -453,7 +453,7 @@
82 LDFLAGS2 += -L$(HHWPATH)lib
83 endif
84
85 -$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) texticon.ico grpicon.ico
86 +$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) TEXTICON.ico GRPICON.ico
87 $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\
88 $(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS)
89
90 @@ -462,7 +462,7 @@
91
92 # rules
93
94 -wgplt_res.$(O) : $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico
95 +wgplt_res.$(O) : $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico
96 $(RC) $(RCFLAGS) $< $(RCOUT)
97 $(RES2COFF)
98
99 @@ -521,13 +521,13 @@
100 $(CC) -c $(CFLAGS) -o $@ $<
101
102 # extract icons from wgnuplot.rc
103 -texticon.ico: grpicon.ico
104 +TEXTICON.ico: GRPICON.ico
105
106 -grpicon.ico: geticon.exe $(W)/wgnuplot.rc
107 +GRPICON.ico: geticon $(W)/wgnuplot.rc
108 ./geticon $(W)/wgnuplot.rc
109
110 -geticon.exe: $(W)/geticon.c
111 - $(LD) $(LDFLAGS) -o $@ $<
112 +geticon: $(W)/geticon.c
113 + gcc -o $@ $<
114
115 ifdef HTML_HELP
116 # convert gnuplot.doc to windows/wgnuplot.html
117 @@ -730,7 +730,7 @@
118 $(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf
119 $(RM) *.$(O) *.po *.o *.co
120 $(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib
121 - $(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c
122 + $(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c
123 $(RM) *.aux *.log *.dvi *.toc
124 $(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf
125 $(RM) titlepag.tex toc_entr.sty VERSION
126 @@ -829,7 +829,7 @@
127
128 installer:
129 $(MAKE) DESTDIR=./dist install
130 - cp -p grpicon.ico ./dist/bin/
131 + cp -p GRPICON.ico ./dist/bin/
132 cp -p $(TOP)/win/*.iss ./dist
133 (cd ./dist; $(ISCC) gnuplot.iss)
134 mv ./dist/gp*-setup.exe .
135 --- a/src/win/wgnuplot.rc 2011-05-13 14:32:22.000000000 -0400
136 +++ b/src/win/wgnuplot.rc 2012-11-30 16:53:59.407926642 -0500
137 @@ -15,8 +15,8 @@
138 * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe
139 */
140
141 -GRPICON ICON "grpicon.ico"
142 -TEXTICON ICON "texticon.ico"
143 +GRPICON ICON "GRPICON.ico"
144 +TEXTICON ICON "TEXTICON.ico"
145
146 #else
147 /* using Borland BRC.EXE */