Mercurial > mxe-octave

view src/of-strings-1-fixes.patch @ 4029:c4a341e3e014

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ffmpeg: updates to work in windows * src/ffmpeg.mk: add --extra-libs='-mconsole' * src/libvpx.mk: set as to yasm * src/x264-1-fix-bin-bash.patch: update vpx patch from mxe.cc * src/x264.mk: update version,checksum for 20141130-2245 * src/xvidcore.mk: dont rename xvidcore.dll to libxvidecore.dll
author John Donoghue
date Fri, 18 Sep 2015 08:05:55 -0400
parents 76247f439f51
children 00e61c4a5657
line wrap: on
line source

diff -ur strings-1.2.0.orig/src/Makefile strings-1.2.0/src/Makefile
--- strings-1.2.0.orig/src/Makefile	2015-06-08 13:43:45.551556353 -0400
+++ strings-1.2.0/src/Makefile	2015-06-08 13:45:22.693478306 -0400
@@ -1,11 +1,7 @@
 OCTAVE ?= octave
 MKOCTFILE ?= mkoctfile -Wall
 
-PCRE_SWITCHES := $(shell $(OCTAVE) \
-	--no-gui --no-init-file --no-site-file --silent --no-history \
-	--eval 'disp (octave_config_info ("PCRE_LIBS"));' \
-	--eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
-	)
+PCRE_SWITCHES := $(shell pcre-config --libs)
 
 pcregexp.oct: %.oct: %.cc
 	$(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<