Mercurial > mxe-octave

view src/of-tsa-1-cross-fixes.patch @ 4310:2c34ec679fb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: update to 5.7.1 * src/qtbase-1-fixes.patch: update patch from mxe.cc * src/qtbase.mk: update version, checksum, use -no-pch * src/qtimageformats-1.patch: update patch from mxe.cc * src/qtimageformats.mk: update checksum * src/qtsvg.mk: update checksum * src/qttools.mk: update checksum
author John D
date Sun, 01 Jan 2017 08:00:17 -0500
parents c970bbc5e7db
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