diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2014-10-30 17:41:58 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-01-19 11:18:24 +0100 |
| commit | 50598bfd0c4959da66780fe695755e2be1a28b87 (patch) | |
| tree | a12ab13e2005478fb01804525b1124de7641cab7 /build/linux | |
| parent | ed56403b30389501d1df7fbbeb763abbe7b09654 (diff) | |
| download | astra-50598bfd0c4959da66780fe695755e2be1a28b87.tar.gz astra-50598bfd0c4959da66780fe695755e2be1a28b87.tar.bz2 astra-50598bfd0c4959da66780fe695755e2be1a28b87.tar.xz astra-50598bfd0c4959da66780fe695755e2be1a28b87.zip | |
Refactor astra_mex_data3d
(Modified) patch by Nicola Viganò
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/Makefile.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 49bc981..a7ac1f2 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -35,6 +35,8 @@ endif ifeq ($(matlab),yes) CPPFLAGS+=-I$(MATLAB_ROOT)/extern/include -DMATLAB_MEX_FILE +CXXFLAGS+=-fopenmp +LDFLAGS+=-fopenmp endif BOOST_CPPFLAGS= @@ -196,7 +198,9 @@ TEST_OBJECTS=\ tests/test_XMLDocument.o MATLAB_CXX_OBJECTS=\ - matlab/mex/mexHelpFunctions.o + matlab/mex/mexHelpFunctions.o \ + matlab/mex/mexCopyDataHelpFunctions.o \ + matlab/mex/mexDataManagerHelpFunctions.o MATLAB_MEX=\ matlab/mex/astra_mex_algorithm_c.$(MEXSUFFIX) \ |