Mercurial > mxe-octave

view src/gnuplot-3-iconv.patch @ 3872:d7b2bb282421

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mingw-w64: patch mingw-w64 for %g bug * dist-files.mk: add mingw-w64-3-fix-g-format.patch * src/mingw-w64-3-fix-g-format.patch: new file * src/build-gcc.mk: apply patches to mingw-w64 before building crt
author John Donoghue
date Mon, 06 Apr 2015 11:30:00 -0400
parents ceeb3ec75690
children
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	2014-07-24 20:30:33 -0400
+++ gnuplot-4.6.4/config/mingw/Makefile	2014-07-24 20:30:50 -0400
@@ -382,8 +382,9 @@
 endif
 
 ifdef ICONV
-	CFLAGS += -DHAVE_ICONV
-	TERMLIBS += -liconv
+	CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS)
+        LDFLAGS += $(ICONV_LDFLAGS)
+	TERMLIBS += -liconv 
 endif
 
 ifdef GNU_RC