Mercurial > mxe-octave

view src/of-fl-core-1-fixes.patch @ 3817:6daa158a7018

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis installer: use octave.vbs as laucher (Bug #41074) * installer-files/octave.vbs: new file * dist-files.mk: add octave.vbs * makeinst-script.sh: use octave.vbs as laucher
author John Donoghue <john.donoghue@ieee.org>
date Mon, 02 Mar 2015 19:14:41 -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