diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-01 12:27:44 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-01 12:27:44 +0100 |
| commit | fff0e6dba508744f540bcf5efff76f676fe7af48 (patch) | |
| tree | 5f33544e7d79b59501a5dd63a4922722eed8a98b /build/linux | |
| parent | 0d5947a0e8e7d6f86c7591a96d877dfe14b187e4 (diff) | |
| parent | dcfd15335549fa8e3e56260791cc4510331f7be6 (diff) | |
Merge branch 'master' into python-plugins
Conflicts:
python/astra/utils.pyx
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index e209fa7..bdffd4c 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -238,7 +238,8 @@ MATLAB_MEX=\ matlab/mex/astra_mex_projector_c.$(MEXSUFFIX) \ matlab/mex/astra_mex_projector3d_c.$(MEXSUFFIX) \ matlab/mex/astra_mex_log_c.$(MEXSUFFIX) \ - matlab/mex/astra_mex_data3d_c.$(MEXSUFFIX) + matlab/mex/astra_mex_data3d_c.$(MEXSUFFIX) \ + matlab/mex/astra_mex_direct_c.$(MEXSUFFIX) ifeq ($(python),yes) ALL_OBJECTS+=src/PluginAlgorithm.lo |