Mercurial > mxe-octave

view src/of-fl-core-1-fixes.patch @ 3638:af91c561ff39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openscenegraph: allow cross compile to succeed * src/openscenegraph.mk: add -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED_EXITCODE=0, build out of source, enable static/dynamic libs * src/openscenegraph-1-fixes.patch: new file * dist-files.mk: added openscenegraph-1-fixes.patch
author John Donoghue
date Wed, 02 Jul 2014 15:27:12 -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