Mercurial > mxe-octave

view src/gnuplot-3-iconv.patch @ 3684:0ea89e795112

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc: update to 4.9.1 from mxe_devel. * src/build-gcc-1-mingw-float.patch: add patch * src/build-gcc-2-intrinsics.patch: add patch * src/build-gcc.mk: update version * src/native-gcc.mk: update version. * dist-files.mk: update to include build-gcc-1-mingw-float.patch, uild-gcc-2-intrinsics.patch
author John Donoghue
date Fri, 08 Aug 2014 11:38:44 -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