Mercurial > forge

changeset 12554:5fbbb9986f8e octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
omit -lgomp - its not necessary and causes problems n macosx
author schloegl
date Sat, 24 Jan 2015 01:13:32 +0000
parents 88eead0cae19
children 6dea7ba11ac7
files extra/NaN/src/Makefile extra/tsa/src/Makefile
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/src/Makefile	Sat Jan 17 23:26:08 2015 +0000
+++ b/extra/NaN/src/Makefile	Sat Jan 24 01:13:32 2015 +0000
@@ -18,8 +18,8 @@
 MEX_OPTION += -largeArrayDims
 
 # Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/
-CROSS   = $(HOME)/src/mingw-cross-env/usr/bin/i686-pc-mingw32-
-CROSS64 = $(HOME)/src/mce-w64/usr/bin/x86_64-w64-mingw32-
+CROSS   = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static-
+CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static-
 # include directory for Win32-Matlab include
 W32MAT_INC = $(HOME)/bin/win32/Matlab/R2010b/extern/include/
 W64MAT_INC = $(HOME)/bin/win64/Matlab/R2010b/extern/include/
@@ -37,7 +37,7 @@
 OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
 RM      = rm
 
-MEX_OPTION  += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
+MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
 MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
 
 PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex 
@@ -81,9 +81,9 @@
 	mkoctfile$(OCTAVE_VERSION) "$<"
 
 %.mex: %.cpp
-	$(OCTMEX) "$<" -lgomp
+	$(OCTMEX) "$<"
 %.$(MEX_EXT): %.cpp
-	$(MATMEX) "$<" -lgomp
+	$(MATMEX) "$<"
 
 svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
 	$(CXX) $(CFLAGS) -c svm.cpp
--- a/extra/tsa/src/Makefile	Sat Jan 17 23:26:08 2015 +0000
+++ b/extra/tsa/src/Makefile	Sat Jan 24 01:13:32 2015 +0000
@@ -18,8 +18,8 @@
 MEX_OPTION += -largeArrayDims
 
 # Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/
-CROSS   = $(HOME)/src/mxe.github.schloegl/usr/bin/i686-w64-mingw32.static
-CROSS64 = $(HOME)/src/mxe.github.schloegl/usr/bin/x86_64-w64-mingw32.static
+CROSS   = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static
+CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static
 # include directory for Win32-Matlab include
 W32MAT_INC = -I$(HOME)/bin/win32/Matlab/R2010b/extern/include/
 W64MAT_INC = -I$(HOME)/bin/win64/Matlab/R2010b/extern/include/
@@ -47,7 +47,7 @@
 OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
 RM      = rm
 
-MEX_OPTION  += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
 MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
 
 PROGS = covm_mex.mex sumskipnan_mex.mex #kalman_maar.mex
@@ -91,9 +91,9 @@
 	mkoctfile$(OCTAVE_VERSION) "$<"
 
 %.mex: %.cpp
-	$(OCTMEX) "$<"  -lgomp -llapack -lblas
+	$(OCTMEX) "$<" -llapack -lblas
 %.$(MEX_EXT): %.cpp
-	$(MATMEX) "$<"  -lgomp -llapack -lblas
+	$(MATMEX) "$<" -llapack -lblas
 
 
 #########################################################