Mercurial > mxe-octave
view src/gnuplot-1-fixes.patch @ 3860:b36a7ab4bd2c
of-fl-core: use OCTAVE_CONFIG to determine system type
* src/of-fl-core-1-fixes.patch: use OCTAVE_CONFIG to determine system type
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Tue, 24 Mar 2015 06:37:36 -0400 |
parents | 53c8b9c843c6 |
children | a397ccee4b57 |
line wrap: on
line source
diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile --- gnuplot-4.6.4.orig/config/mingw/Makefile 2013-11-04 18:26:55.000000000 -0500 +++ gnuplot-4.6.4/config/mingw/Makefile 2013-11-04 18:28:37.000000000 -0500 @@ -27,7 +27,7 @@ # Use more modern HTML help instead of no longer supported Windows help system # Please update the HHWPATH below if necessary. -HTML_HELP=1 +#HTML_HELP=1 # GIF, PNG, JPEG device drivers # Requires gd library. There are two possibilities how to configure these @@ -127,29 +127,29 @@ # -mpentiumpro means optimize for Pentium II and Pro procesors #CFLAGS += -ifdef HTML_HELP - -# To compile the .chm file you need the Microsoft HTML Help 1.4 SDK -# It can be obtained here: -# http://go.microsoft.com/fwlink/?LinkId=154968 -# We need to explicitly set the correct path here since we also need -# adjust the include and linrary paths. -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" -HHC = $(HHWPATH)hhc +# ifdef HTML_HELP -else +# # To compile the .chm file you need the Microsoft HTML Help 1.4 SDK +# # It can be obtained here: +# # http://go.microsoft.com/fwlink/?LinkId=154968 +# # We need to explicitly set the correct path here since we also need +# # adjust the include and linrary paths. +# HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" +# HHC = $(HHWPATH)hhc + +# else + +# # To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help +# # Workshop. The latter can be obtained from either of +# # ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe +# # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098 +# # Put the path to hcw here unless it is already in PATH: +# HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" +# HCW = $(HCWPATH)hcw +# # Switches are for HCW 4.03: +# HCWFLAG = -# To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help -# Workshop. The latter can be obtained from either of -# ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe -# http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098 -# Put the path to hcw here unless it is already in PATH: -HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" -HCW = $(HCWPATH)hcw -# Switches are for HCW 4.03: -HCWFLAG = - -endif +# endif # Choose which windres/rc do you want to use (GNU windres or MS RC): GNU_RC = 1 @@ -401,7 +401,7 @@ RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O) endif -default: $(TARGET) $(MENUFILE) support +default: $(TARGET) $(MENUFILE) # support console: $(MAKE) TARGET=gnuplot.exe gnuplot.exe @@ -443,7 +443,7 @@ LDFLAGS2 += -L$(HHWPATH)lib endif -$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) texticon.ico grpicon.ico +$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) TEXTICON.ico GRPICON.ico $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\ $(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS) @@ -458,7 +458,7 @@ # explicit rules -wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico +wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico $(RC) $(RCFLAGS) $< $(RCOUT) $(RES2COFF) @@ -494,13 +494,13 @@ $(CC) -c $(CFLAGS) $(CXXFLAGS) $(PANGOCAIRO_CFLAGS) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< # extract icons from wgnuplot.rc -texticon.ico: grpicon.ico +TEXTICON.ico: GRPICON.ico -grpicon.ico: geticon.exe $(W)/wgnuplot.rc +GRPICON.ico: geticon $(W)/wgnuplot.rc ./geticon $(W)/wgnuplot.rc -geticon.exe: $(W)/geticon.c - $(LD) $(LDFLAGS) -o $@ $< +geticon: $(W)/geticon.c + gcc -o $@ $< ifdef HTML_HELP # convert gnuplot.doc to windows/wgnuplot.html @@ -703,7 +703,7 @@ $(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf $(RM) *.$(O) *.po *.o *.co *.d $(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib - $(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c + $(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c $(RM) *.aux *.log *.dvi *.toc $(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf $(RM) titlepag.tex toc_entr.sty VERSION @@ -802,7 +802,7 @@ installer: $(MAKE) DESTDIR=./dist install - cp -p grpicon.ico ./dist/bin/ + cp -p GRPICON.ico ./dist/bin/ cp -p $(TOP)/win/*.iss ./dist (cd ./dist; $(ISCC) gnuplot.iss) ifdef RELEASE diff -ur gnuplot-4.6.4.orig/src/win/wgnuplot.rc gnuplot-4.6.4/src/win/wgnuplot.rc --- gnuplot-4.6.4.orig/src/win/wgnuplot.rc 2013-11-04 18:26:55.000000000 -0500 +++ gnuplot-4.6.4/src/win/wgnuplot.rc 2013-11-04 18:27:15.000000000 -0500 @@ -15,8 +15,8 @@ * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe */ -GRPICON ICON "grpicon.ico" -TEXTICON ICON "texticon.ico" +GRPICON ICON "GRPICON.ico" +TEXTICON ICON "TEXTICON.ico" #else /* using Borland BRC.EXE */