Mercurial > mxe-octave

comparison src/of-fl-core-1-fixes.patch @ 3420:207b5f6713d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update fl-core for current release patch Makefile.in: add fl-core to octave forge package list src/of-fl-core-1-fixes.patch: update patch for current release. src/of-fl-core.mk: Update checksum
author John Donoghue <john.donoghue@ieee.org>
date Mon, 13 Jan 2014 21:27:34 -0500
parents e7e29aeea726
children 85568f3159a4
comparison
equal deleted inserted replaced
3419:e7e29aeea726 3420:207b5f6713d9
1 --- Makefile.sf 2014-01-12 21:32:17 -0500 1 diff -ur fl-core.orig/src/Makefile fl-core/src/Makefile
2 +++ Makefile 2014-01-12 21:40:00 -0500 2 --- fl-core.orig/src/Makefile 2014-01-13 21:23:20.000000000 -0500
3 @@ -3,10 +3,14 @@ 3 +++ fl-core/src/Makefile 2014-01-13 21:24:15.000000000 -0500
4 @@ -1,8 +1,13 @@
5 OCT = fl_compose.oct
6 SRC := $(OCT:.oct=.cc)
4 BASE := $(OCT:.oct=) 7 BASE := $(OCT:.oct=)
5 8 -ifdef COMSPEC
6 ifdef COMSPEC 9 +
7 +ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE))) 10 +ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE)))
8 + ADDPARAM := -lpthread 11 + ADDPARAM := -lpthread
9 +else 12 +else
10 ifneq ($(shell uname -o),Cygwin) 13 + ifdef COMSPEC
11 ADDPARAM := -lpthreadVC2 14 ADDPARAM := -lpthreadVC2
15 + endif
12 endif 16 endif
13 endif
14 +endif
15 17
16 .phony: all 18 .phony: all
17 all: $(OCT)