diff options
author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-02-22 12:12:27 +0100 |
---|---|---|
committer | Willem Jan Palenstijn <wjp@usecode.org> | 2016-02-22 12:12:27 +0100 |
commit | cd395d2af23530f9da471fd6c512e9890c08f69d (patch) | |
tree | 0fb1b8431ef1773d0f4fcee9e780a19a371021a9 /matlab/mex/mexInitFunctions.cpp | |
parent | 3743fdc534b39958c105f4124ad1130d3e8b042a (diff) | |
parent | d2705f52766716b4d4627a62de92e7a2480b6b86 (diff) | |
download | astra-cd395d2af23530f9da471fd6c512e9890c08f69d.tar.gz astra-cd395d2af23530f9da471fd6c512e9890c08f69d.tar.bz2 astra-cd395d2af23530f9da471fd6c512e9890c08f69d.tar.xz astra-cd395d2af23530f9da471fd6c512e9890c08f69d.zip |
Merge pull request #111 from wjp/pluginbuild
Remove dependency of libastra on libpython
Diffstat (limited to 'matlab/mex/mexInitFunctions.cpp')
-rw-r--r-- | matlab/mex/mexInitFunctions.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/matlab/mex/mexInitFunctions.cpp b/matlab/mex/mexInitFunctions.cpp index bd3df2c..7245af2 100644 --- a/matlab/mex/mexInitFunctions.cpp +++ b/matlab/mex/mexInitFunctions.cpp @@ -23,5 +23,13 @@ void initASTRAMex(){ if(!astra::CLogger::setCallbackScreen(&logCallBack)){ mexErrMsgTxt("Error initializing mex functions."); } + mexIsInitialized=true; + + + // If we have support for plugins, initialize them. + // (NB: Call this after setting mexIsInitialized, to avoid recursively + // calling initASTRAMex) + mexEvalString("if exist('astra_mex_plugin_c') == 3; astra_mex_plugin_c('init'); end"); + } |