Mercurial > forge

changeset 6586:f1e5407f7bd1 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compilation of SVMTRAIN fixed
author schloegl
date Thu, 14 Jan 2010 21:27:15 +0000
parents ae521dec5b54
children 64fc8b4b2b23
files extra/NaN/src/Makefile extra/NaN/src/make.m extra/NaN/src/svm_model_matlab.h
diffstat 3 files changed, 17 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/src/Makefile	Thu Jan 14 17:50:16 2010 +0000
+++ b/extra/NaN/src/Makefile	Thu Jan 14 21:27:15 2010 +0000
@@ -32,24 +32,24 @@
 
 svmtrain_mex.mex svmpredict_mex.mex:     svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c
 	$(CXX) $(CFLAGS) -I /usr/include/octave -c svm.cpp
-	$(CXX) $(CFLAGS) -I /usr/include/octave -c svm_model_matlab.c
+	$(CC) $(CFLAGS) -I /usr/include/octave -c svm_model_matlab.c
 	env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
 	env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
 
 svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT):     svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c
 	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp
-	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm_model_matlab.c
+	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm_model_matlab.c
 	$(MATMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
 	$(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
 
-train.$(MEX_EXT) predict.$(MEX_EXT): train.c linear.h tron.o linear.o linear_model_matlab.c
+train.$(MEX_EXT) predict.$(MEX_EXT): train.cpp linear.h tron.o linear.o linear_model_matlab.c
 	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
-	$(MATMEX)  -lblas  train.c tron.o linear.o linear_model_matlab.o 
+	$(MATMEX)  -lblas train.cpp tron.o linear.o linear_model_matlab.o 
 	#$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
 
-train.mex predict.mex: train.c linear.h tron.o linear.o linear_model_matlab.c
+train.mex predict.mex: train.cpp linear.h tron.o linear.o linear_model_matlab.c
 	$(CC) $(CFLAGS) -I /usr/include/octave -c linear_model_matlab.c
-	env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.o
+	env CC=$(CXX) $(OCTMEX) -lblas train.cpp tron.o linear.o linear_model_matlab.o
 	#env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
 
 linear.o: linear.cpp linear.h
--- a/extra/NaN/src/make.m	Thu Jan 14 17:50:16 2010 +0000
+++ b/extra/NaN/src/make.m	Thu Jan 14 21:27:15 2010 +0000
@@ -19,9 +19,9 @@
 if strcmp(computer,'PCWIN')
 	mex svmtrain_mex.cpp svm.obj svm_model_matlab.obj
 	mex svmpredict_mex.cpp svm.obj svm_model_matlab.obj
-	mex train.c tron.obj linear.obj linear_model_matlab.obj 
+	mex train.cpp tron.obj linear.obj linear_model_matlab.obj 
 else
-	mex -cxx svmtrain_mex.c svm.o svm_model_matlab.o 
-	mex -cxx svmpredict_mex.cpp svm.o svm_model_matlab.o
-	mex -cxx train.c tron.o linear.o linear_model_matlab.o 
+	mex svmtrain_mex.cpp svm.o svm_model_matlab.o 
+	mex svmpredict_mex.cpp svm.o svm_model_matlab.o
+	mex train.cpp tron.o linear.o linear_model_matlab.o 
 end; 
\ No newline at end of file
--- a/extra/NaN/src/svm_model_matlab.h	Thu Jan 14 17:50:16 2010 +0000
+++ b/extra/NaN/src/svm_model_matlab.h	Thu Jan 14 21:27:15 2010 +0000
@@ -39,8 +39,15 @@
 
 */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 const char *model_to_matlab_structure(mxArray *plhs[], int num_of_feature, struct svm_model *model);
 struct svm_model *matlab_matrix_to_model(const mxArray *matlab_struct, const char **error_message);
 
+#ifdef __cplusplus
+}
+#endif
 
+