Mercurial > mxe-octave

view src/gnuplot-3-iconv.patch @ 3771:09ad2f46e0b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openssl: update to 1.0.1k * src/openssl.mk: update version, checksum * src/openssl-1-fixes.patch: update patch from mxe.cc (devel)
author John Donoghue
date Thu, 15 Jan 2015 09:29:55 -0500
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