view src/of-fl-core-1-fixes.patch @ 3775:7f250bf4c472

postgresql: update to v9.4.0 * src/postgresql.mk: update version,checksum, install common and extra includes. * src/postgresql-1-fixes.patch: removed * dist-files.mk: remove postgresql-1-fixes.patch
author John Donoghue
date Fri, 23 Jan 2015 10:03:25 -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