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> | 2014-12-04 14:19:44 +0100 |
| commit | 4f525533a2037ad9d0fc8849e38ec72c32991bb4 (patch) | |
| tree | 086601c4d9233926bd9b91fc0be3b76fe45256d2 /build | |
| parent | 899faabba87628698fbc02a06f4a91ba6469fd8d (diff) | |
| download | astra-4f525533a2037ad9d0fc8849e38ec72c32991bb4.tar.gz astra-4f525533a2037ad9d0fc8849e38ec72c32991bb4.tar.bz2 astra-4f525533a2037ad9d0fc8849e38ec72c32991bb4.tar.xz astra-4f525533a2037ad9d0fc8849e38ec72c32991bb4.zip | |
Refactor astra_mex_data3d
(Modified) patch by Nicola Viganò
Diffstat (limited to 'build')
| -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 d39c044..685e1e5 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= @@ -197,7 +199,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) \ |