Mercurial > mxe-octave
view src/of-fl-core-1-fixes.patch @ 3854:85568f3159a4
binary-packages: update for cross tools
* Makefile.in: add MXE_OCTAVECONFIG and use for of-pkg building
* dist-files.mk: add of-fits-1-cross-fixes.patch, of-sockets-1-cross-fixes.patch
* src/default-octave.mk: use --enable-cross-tools not --enable-cross-mkoctfile and
install octave-config
* src/of-fits-1-cross-fixes.patch: new file
* src/of-fits.mk: enable package compile
* src/of-fl-core-1-fixes.patch: new file
* src/of-fl-core.mk: enable pkg conpile
* src/of-sockets-1-cross-fixes.patch: new file
* src/of-sockets.mk: enable pkg conpile
author | John Donoghue |
---|---|
date | Fri, 20 Mar 2015 14:39:17 -0400 |
parents | 207b5f6713d9 |
children | b36a7ab4bd2c |
line wrap: on
line source
diff -ur fl-core/src/Makefile fl-core.new/src/Makefile --- fl-core/src/Makefile 2011-02-06 14:09:03.000000000 -0500 +++ fl-core.new/src/Makefile 2015-03-20 13:45:48.577323118 -0400 @@ -1,15 +1,23 @@ OCT = fl_compose.oct SRC := $(OCT:.oct=.cc) BASE := $(OCT:.oct=) -ifdef COMSPEC + +MKOCTFILE ?= mkoctfile +OCTAVECONFIG ?= octave-config + +ifneq (,$(findstring mingw,$(shell $(OCTAVECONFIG) -p CANONICAL_HOST_TYPE))) + ADDPARAM := -lpthread +else + ifdef COMSPEC ADDPARAM := -lpthreadVC2 + endif endif .phony: all all: $(OCT) %.oct: %.cc - mkoctfile -s $< $(ADDPARAM) + $(MKOCTFILE) -s $< $(ADDPARAM) .phony: clean clean: