Mercurial > mxe-octave
view src/of-fl-core-1-fixes.patch @ 4029:c4a341e3e014
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 | b36a7ab4bd2c |
children | 1c72016826aa |
line wrap: on
line source
diff -ur fl-core/src/Makefile fl-core.new/src/Makefile --- fl-core/src/Makefile 2011-02-06 14:09:03.000000000 -0500 +++ fl-core.new/src/Makefile 2015-03-20 13:45:48.577323118 -0400 @@ -1,15 +1,23 @@ OCT = fl_compose.oct SRC := $(OCT:.oct=.cc) BASE := $(OCT:.oct=) -ifdef COMSPEC + +MKOCTFILE ?= mkoctfile +OCTAVE_CONFIG ?= octave-config + +ifneq (,$(findstring mingw,$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))) + ADDPARAM := -lpthread +else + ifdef COMSPEC ADDPARAM := -lpthreadVC2 + endif endif .phony: all all: $(OCT) %.oct: %.cc - mkoctfile -s $< $(ADDPARAM) + $(MKOCTFILE) -s $< $(ADDPARAM) .phony: clean clean: