Mercurial > mxe-octave
view src/of-fl-core-1-fixes.patch @ 3856:7ee9c478ce02
octave.mk: update for 4.0.0-rc2
* src/octave.mk: update version, checksum
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 21 Mar 2015 14:39:14 -0400 |
parents | 85568f3159a4 |
children | b36a7ab4bd2c |
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 +OCTAVECONFIG ?= octave-config + +ifneq (,$(findstring mingw,$(shell $(OCTAVECONFIG) -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: