Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
1 diff -ur fl-core/src/Makefile fl-core.new/src/Makefile
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
2 --- fl-core/src/Makefile 2011-02-06 14:09:03.000000000 -0500
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
3 +++ fl-core.new/src/Makefile 2015-03-20 13:45:48.577323118 -0400
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
4 @@ -1,15 +1,23 @@
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
5 OCT = fl_compose.oct
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
6 SRC := $(OCT:.oct=.cc)
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 BASE := $(OCT:.oct=)
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
8 -ifdef COMSPEC
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
9 +
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
10 +MKOCTFILE ?= mkoctfile
3860
b36a7ab4bd2c of-fl-core: use OCTAVE_CONFIG to determine system type
John Donoghue <john.donoghue@ieee.org>
parents: 3854
diff changeset
11 +OCTAVE_CONFIG ?= octave-config
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
12 +
3860
b36a7ab4bd2c of-fl-core: use OCTAVE_CONFIG to determine system type
John Donoghue <john.donoghue@ieee.org>
parents: 3854
diff changeset
13 +ifneq (,$(findstring mingw,$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)))
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 + ADDPARAM := -lpthread
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 +else
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
16 + ifdef COMSPEC
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 ADDPARAM := -lpthreadVC2
3420
207b5f6713d9 Update fl-core for current release patch
John Donoghue <john.donoghue@ieee.org>
parents: 3419
diff changeset
18 + endif
3419
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 endif
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20
e7e29aeea726 Add octave forge 'fl-core' package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 .phony: all
3854
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
22 all: $(OCT)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
23
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
24 %.oct: %.cc
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
25 - mkoctfile -s $< $(ADDPARAM)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
26 + $(MKOCTFILE) -s $< $(ADDPARAM)
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
27
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
28 .phony: clean
85568f3159a4 binary-packages: update for cross tools
John Donoghue
parents: 3420
diff changeset
29 clean: