Added -std=c++11 for compiling mex files against newer versions of Oc…

…tave (>4.0)
ayrna · Nov 14, 2017 · cb1c9f9 · cb1c9f9
1 parent 924b93a
commit cb1c9f9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/Algorithms/Makefile b/src/Algorithms/Makefile
@@ -1,8 +1,11 @@
 SUBDIRS = libsvm-rank-2.81/matlab libsvm-weights-3.12/matlab orensemble SVORIM SVOREX
 # Matlab instalation dir
 #export MATLABDIR = /usr/local/MATLAB/R2017b
-export MATLABDIR = /usr/local/MATLAB/R2013a
-export OCTAVEDIR = /usr/include/octave-4.0.3/octave
+export MATLABDIR = /usr/local/MATLAB/R2016a
+export OCTAVEDIR = /home/pedroa/anaconda3/include/octave-4.2.1/octave/
+
+# Uncomment for newer versions of Octave
+export OCTAVE_CFLAGS = -std=c++11 -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
 
 SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
 

diff --git a/src/Algorithms/SVOREX/Makefile b/src/Algorithms/SVOREX/Makefile
@@ -18,7 +18,7 @@ OCTAVEDIR ?= /usr/include/octave-4.0.3/octave
 OCTAVE_MEX = env CC=$(CXX) mkoctfile
 OCTAVE_MEX_OPTION = --mex
 OCTAVE_MEX_EXT = mex
-OCTAVE_CFLAGS = -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
+OCTAVE_CFLAGS ?= -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
 
 objects = alphas.o cachelist.o datalist.o def_settings.o kcv.o loadfile.o main.o ordinal_takestep.o setandfi.o smo_kernel.o smo_routine.o smo_settings.o smo_timer.o svc_predict.o
 

diff --git a/src/Algorithms/SVORIM/Makefile b/src/Algorithms/SVORIM/Makefile
@@ -19,7 +19,7 @@ OCTAVEDIR ?= /usr/include/octave-4.0.3/octave
 OCTAVE_MEX = env CC=$(CXX) mkoctfile
 OCTAVE_MEX_OPTION = --mex
 OCTAVE_MEX_EXT = mex
-OCTAVE_CFLAGS = -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
+OCTAVE_CFLAGS ?= -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
 
 objects = alphas.o cachelist.o datalist.o def_settings.o kcv.o loadfile.o main.o ordinal_takestep.o setandfi.o smo_kernel.o smo_routine.o smo_settings.o smo_timer.o svc_predict.o
 

diff --git a/src/Algorithms/libsvm-rank-2.81/matlab/Makefile b/src/Algorithms/libsvm-rank-2.81/matlab/Makefile
@@ -19,7 +19,7 @@ OCTAVEDIR ?= /usr/include/octave-4.0.3/octave
 OCTAVE_MEX = env CC=$(CXX) mkoctfile
 OCTAVE_MEX_OPTION = --mex
 OCTAVE_MEX_EXT = mex
-OCTAVE_CFLAGS = -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
+OCTAVE_CFLAGS ?= -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
 
 all:	matlab
 

diff --git a/src/Algorithms/libsvm-weights-3.12/matlab/Makefile b/src/Algorithms/libsvm-weights-3.12/matlab/Makefile
@@ -18,7 +18,7 @@ OCTAVEDIR ?= /usr/include/octave-4.0.3/octave
 OCTAVE_MEX = env CC=$(CXX) mkoctfile
 OCTAVE_MEX_OPTION = --mex
 OCTAVE_MEX_EXT = mex
-OCTAVE_CFLAGS = -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
+OCTAVE_CFLAGS ?= -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
 
 all:	matlab