Mercurial > mxe-octave
diff src/of-fl-core-1-fixes.patch @ 3420:207b5f6713d9
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 |
line wrap: on
line diff
--- a/src/of-fl-core-1-fixes.patch Mon Jan 13 18:26:59 2014 -0500 +++ b/src/of-fl-core-1-fixes.patch Mon Jan 13 21:27:34 2014 -0500 @@ -1,17 +1,18 @@ ---- Makefile.sf 2014-01-12 21:32:17 -0500 -+++ Makefile 2014-01-12 21:40:00 -0500 -@@ -3,10 +3,14 @@ +diff -ur fl-core.orig/src/Makefile fl-core/src/Makefile +--- fl-core.orig/src/Makefile 2014-01-13 21:23:20.000000000 -0500 ++++ fl-core/src/Makefile 2014-01-13 21:24:15.000000000 -0500 +@@ -1,8 +1,13 @@ + OCT = fl_compose.oct + SRC := $(OCT:.oct=.cc) BASE := $(OCT:.oct=) - - ifdef COMSPEC +-ifdef COMSPEC ++ +ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE))) + ADDPARAM := -lpthread +else - ifneq ($(shell uname -o),Cygwin) ++ ifdef COMSPEC ADDPARAM := -lpthreadVC2 ++ endif endif - endif -+endif .phony: all - all: $(OCT)