Mercurial > mxe-octave

view src/of-fl-core-1-fixes.patch @ 3552:b82ff8ba6a8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis-installer: check for win8 version and set -i --line-editing in shortcuts * makeinst-script.sh: add --line-editing to gui and commandline launcher shortcuts when in windows 8.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 25 Feb 2014 18:29:43 -0500
parents 207b5f6713d9
children 85568f3159a4
line wrap: on
line source

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 
+
+ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE)))
+	ADDPARAM := -lpthread
+else
+ ifdef COMSPEC 
 	ADDPARAM := -lpthreadVC2
+ endif
 endif
 
 .phony: all