1. use "extern C" in blas to make sure the compiled function names are always not...

2. replace ``#'' with ``='' in matlab/Makefile

diff --git a/blas/blasp.h b/blas/blasp.h
index 745836db877800a0b308699956d63f240fa4bfee..fbf6e7fe096dd4cce6677d358b9db284b4aed411 100644 (file)
--- a/blas/blasp.h
+++ b/blas/blasp.h
@@ -3,6 +3,10 @@
 
 /* Functions  listed in alphabetical order */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef F2C_COMPAT
 
 void cdotc_(fcomplex *dotval, int *n, fcomplex *cx, int *incx,
@@ -428,3 +432,7 @@ int ztrsm_(char *side, char *uplo, char *transa, char *diag, int *m,
 
 int ztrsv_(char *uplo, char *trans, char *diag, int *n, dcomplex *a,
            int *lda, dcomplex *x, int *incx);
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/blas/daxpy.c b/blas/daxpy.c
index 58f345a53ae80cd9e2e8a989061028a6158dc645..f762bd53f5015cb213cc64aeb8caf5db4a1bd338 100644 (file)
--- a/blas/daxpy.c
+++ b/blas/daxpy.c
@@ -1,5 +1,9 @@
 #include "blas.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int daxpy_(int *n, double *sa, double *sx, int *incx, double *sy,
            int *incy)
 {
@@ -47,3 +51,7 @@ int daxpy_(int *n, double *sa, double *sx, int *incx, double *sy,
 
   return 0;
 } /* daxpy_ */
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/blas/ddot.c b/blas/ddot.c
index a64a2808f04f0c12472ac6adef02fbf60567fc20..adc0965416cd0341fe16784b929c8b55e6fbb670 100644 (file)
--- a/blas/ddot.c
+++ b/blas/ddot.c
@@ -1,5 +1,9 @@
 #include "blas.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 double ddot_(int *n, double *sx, int *incx, double *sy, int *incy)
 {
   long int i, m, nn, iincx, iincy;
@@ -48,3 +52,7 @@ double ddot_(int *n, double *sx, int *incx, double *sy, int *incy)
 
   return stemp;
 } /* ddot_ */
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/blas/dnrm2.c b/blas/dnrm2.c
index e50cdf777de340103eeac74f9253d73500e99410..78987832dfa546218f437f9bf8387379383b188e 100644 (file)
--- a/blas/dnrm2.c
+++ b/blas/dnrm2.c
@@ -1,6 +1,10 @@
 #include <math.h>  /* Needed for fabs() and sqrt() */
 #include "blas.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 double dnrm2_(int *n, double *x, int *incx)
 {
   long int ix, nn, iincx;
@@ -60,3 +64,7 @@ double dnrm2_(int *n, double *x, int *incx)
   return norm;
 
 } /* dnrm2_ */
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/blas/dscal.c b/blas/dscal.c
index a0eca0c399b861e776611d9cf986c368a5eac741..2bbdebcc00e28c6c85700fa0d7176f924fb9e12f 100644 (file)
--- a/blas/dscal.c
+++ b/blas/dscal.c
@@ -1,5 +1,9 @@
 #include "blas.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int dscal_(int *n, double *sa, double *sx, int *incx)
 {
   long int i, m, nincx, nn, iincx;
@@ -42,3 +46,7 @@ int dscal_(int *n, double *sa, double *sx, int *incx)
 
   return 0;
 } /* dscal_ */
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/matlab/Makefile b/matlab/Makefile
index c70a76fbdbd1e00ad166dd67c8259537822280f4..a2c02845d3ff414ddab11ef05ee90bb301af06a8 100644 (file)
--- a/matlab/Makefile
+++ b/matlab/Makefile
@@ -7,7 +7,7 @@ CC ?= gcc
 CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..
 
 MEX = $(MATLABDIR)/bin/mex
-MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
 # comment the following line if you use MATLAB on a 32-bit computer
 MEX_OPTION += -largeArrayDims
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)