Mercurial > mxe-octave
annotate src/of-tsa-1-cross-fixes.patch @ 4039:1c72016826aa
of-fl-core: update patch for --enable-64
* src/of-fl-core-1-fixes.patch: update patch
author | John Donoghue |
---|---|
date | Wed, 30 Sep 2015 14:11:45 -0400 |
parents | c970bbc5e7db |
children |
rev | line source |
---|---|
3941
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 diff -ur tsa.orig/src/Makefile tsa/src/Makefile |
4030 | 2 --- tsa.orig/src/Makefile 2015-09-16 09:30:29.103875849 -0400 |
3 +++ tsa/src/Makefile 2015-09-16 09:40:42.945344571 -0400 | |
4 @@ -41,9 +41,16 @@ | |
3941
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
5 |
4030 | 6 CC ?= gcc |
7 CXX ?= g++ | |
8 -CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC | |
9 -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp | |
3941
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
10 -RM = rm |
4030 | 11 +CFLAGS ?= -Wall -Wextra -Wconversion -O2 -fPIC |
3941
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
12 +MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION) |
4030 | 13 +OCTAVE_CONFIG ?= octave-config |
14 +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE) | |
15 +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) | |
16 + OCTMEX ?= $(MKOCTFILE) --mex | |
17 +else | |
18 + OCTMEX ?= $(MKOCTFILE) --mex -lgomp | |
19 +endif | |
3941
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
20 +RM ?= rm |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
21 |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
22 ifneq (Darwin,$(shell uname)) |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
23 CFLAGS += -fopenmp |
4030 | 24 @@ -89,7 +96,7 @@ |
3941
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
25 # Octave, MATLAB on Linux |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
26 ######################################################### |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
27 %.oct: %.cc |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
28 - mkoctfile$(OCTAVE_VERSION) "$<" |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
29 + $(MKOCTFILE) "$<" |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
30 |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
31 %.mex: %.cpp |
1368ac3ea124
of-tsa: update to v4.2.9
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
32 $(OCTMEX) "$<" -llapack -lblas |