correction for makefile.mgw for the change at 2009-08-28

[Tatsuro M. <tma...@ya...>]

Hello Benjamin

Thank you for your efforts for 'pngcairo and pdfcairo terminals'.
However, makefile.mgw caused an error when link stage.

g++  -shared-libgcc -L/WinDevTools/bin -L/WinDevTools/lib  -L/GnuWin32/lib -L/GnuWin32/bin -s
-mconsole -o gnuplot.exe a
lloc.o axis.o binary.o bitmap.o breaders.o color.o command.o contour.o datafile.o dynarray.o eval.o
fit.o gadgets.o getc
olor.o graph3d.o graphics.o help.o hidden3d.o history.o internal.o interpol.o matrix.o misc.o mouse.o
parse.o plot.o plo
t2d.o plot3d.o pm3d.o readline.o save.o scanner.o set.o show.o specfun.o standard.o stdfn.o tables.o
tabulate.o term.o t
ime.o unset.o util.o util3d.o variable.o version.o gpexecute.o  gp_cairo.o winmain.o wgnuplib.o
wgraph.o wprinter.o wtex
t.o wpause.o wmenu.o wgplt_res.o -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32
-ladvapi32\
         -lgd -ljpeg -lfontconfig -lfreetype -lpng12 -lz /WinDevTools/lib/libiconv.a 
-LC:/Programs/WinDevTools/lib -lca
iro   -LC:/Programs/WinDevTools/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0
-lglib-2.0 -lintl
 -lstdc++_s
term.o:term.c:(.text+0x8d9b): undefined reference to `gp_cairo_helper_coordval_to_chars'
collect2: ld returned 1 exit status
make: *** [gnuplot.exe] Error 1
make: Leaving directory `/home/gnuplotcvs/gnuplot/src'

*******************
The following is the patch to avoid this error
*********************************************

--- makefile.mgw.orig	2009-08-31 10:28:40 +0900
+++ makefile.mgw	2009-08-31 10:36:30 +0900
@@ -265,7 +265,7 @@
 	CAIRO_LIBS = $(shell pkg-config --libs cairo)
 	PANGO_CFLAGS = $(shell pkg-config --cflags pangocairo)
 	PANGO_LIBS = $(shell pkg-config --libs pangocairo)
-	CAIRO_OBJS = gp_cairo.o
+	CAIRO_OBJS = gp_cairo.o gp_cairo_helpers.o
 	TERMFLAGS += $(CAIRO_CFLAGS) $(PANGO_CFLAGS)
 endif
 
#****************

Regards

Tatsuro



--------------------------------------
Thanks 10 years!  Yahoo! Shopping and Yahoo! Auctions
http://pr.mail.yahoo.co.jp/ec10years/