Mercurial > mxe-octave

view src/of-fl-core-1-fixes.patch @ 3851:c55d9f182272

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use MXE_XXXX tools for octave qt compiling (Bug 44563) * Makefile.in: add cross/native MXE_UIC,MOC,LRELEASE,RCC variables where missing * src/octave.mk, src/default-octave.mk, src/stable-octave.mk: use MXE_XXX qt tools
author John Donoghue
date Tue, 17 Mar 2015 16:03:03 -0400
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