Mercurial > mxe-octave
view src/of-tsa-1-cross-fixes.patch @ 4030:c970bbc5e7db
tsa: update to v4.3.2
* src/of-tsa.mk: update version, checksum
* src/of-tsa-1-cross-fixes.patch: update patch file
* build_packages.m: update tsa version
author | John Donoghue |
---|---|
date | Wed, 16 Sep 2015 11:53:50 -0400 |
parents | 1368ac3ea124 |
children |
line wrap: on
line source
diff -ur tsa.orig/src/Makefile tsa/src/Makefile --- tsa.orig/src/Makefile 2015-09-16 09:30:29.103875849 -0400 +++ tsa/src/Makefile 2015-09-16 09:40:42.945344571 -0400 @@ -41,9 +41,16 @@ CC ?= gcc CXX ?= g++ -CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp -RM = rm +CFLAGS ?= -Wall -Wextra -Wconversion -O2 -fPIC +MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION) +OCTAVE_CONFIG ?= octave-config +CANONICAL_HOST_TYPE=$(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE) +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) + OCTMEX ?= $(MKOCTFILE) --mex +else + OCTMEX ?= $(MKOCTFILE) --mex -lgomp +endif +RM ?= rm ifneq (Darwin,$(shell uname)) CFLAGS += -fopenmp @@ -89,7 +96,7 @@ # Octave, MATLAB on Linux ######################################################### %.oct: %.cc - mkoctfile$(OCTAVE_VERSION) "$<" + $(MKOCTFILE) "$<" %.mex: %.cpp $(OCTMEX) "$<" -llapack -lblas