Commit 1cd2df56 authored by Houtan Bastani's avatar Houtan Bastani
Browse files

Merge pull request #956 from JohannesPfeifer/dyn_mex_windows

Fix bugs in dyn_mex.m under Windows
parents 73e1ddf7 c39331d5
......@@ -47,11 +47,11 @@ end
if ~exist('OCTAVE_VERSION')
% Some mex commands are enclosed in an eval(), because otherwise it will make Octave fail
if ispc
if msvc
if strcmp(win_compiler,'msvc')
% MATLAB/Windows + Microsoft Visual C++
eval(['mex -O LINKFLAGS="$LINKFLAGS /export:Dynamic" ' basename '_dynamic.c ' basename '_dynamic_mex.c'])
eval(['mex -O LINKFLAGS="$LINKFLAGS /export:Dynamic" ' basename '_static.c ' basename '_static_mex.c'])
elseif cygwin
eval(['mex -O LINKFLAGS="$LINKFLAGS /export:Static" ' basename '_static.c ' basename '_static_mex.c'])
elseif strcmp(win_compiler,'cygwin')
% MATLAB/Windows + Cygwin g++
eval(['mex -O PRELINK_CMDS1="echo EXPORTS > mex.def & echo ' ...
'mexFunction >> mex.def & echo Dynamic >> mex.def" ' ...
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment