Mercurial > mxe-octave

comparison src/of-fl-core-1-fixes.patch @ 3860:b36a7ab4bd2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-fl-core: use OCTAVE_CONFIG to determine system type * src/of-fl-core-1-fixes.patch: use OCTAVE_CONFIG to determine system type
author John Donoghue <john.donoghue@ieee.org>
date Tue, 24 Mar 2015 06:37:36 -0400
parents 85568f3159a4
children 1c72016826aa
comparison
equal deleted inserted replaced
3859:74f53761f74d 3860:b36a7ab4bd2c
6 SRC := $(OCT:.oct=.cc) 6 SRC := $(OCT:.oct=.cc)
7 BASE := $(OCT:.oct=) 7 BASE := $(OCT:.oct=)
8 -ifdef COMSPEC 8 -ifdef COMSPEC
9 + 9 +
10 +MKOCTFILE ?= mkoctfile 10 +MKOCTFILE ?= mkoctfile
11 +OCTAVECONFIG ?= octave-config 11 +OCTAVE_CONFIG ?= octave-config
12 + 12 +
13 +ifneq (,$(findstring mingw,$(shell $(OCTAVECONFIG) -p CANONICAL_HOST_TYPE))) 13 +ifneq (,$(findstring mingw,$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)))
14 + ADDPARAM := -lpthread 14 + ADDPARAM := -lpthread
15 +else 15 +else
16 + ifdef COMSPEC 16 + ifdef COMSPEC
17 ADDPARAM := -lpthreadVC2 17 ADDPARAM := -lpthreadVC2
18 + endif 18 + endif