From c39331d526191055b37c763d223a63ec2c495c04 Mon Sep 17 00:00:00 2001
From: Johannes Pfeifer <jpfeifer@gmx.de>
Date: Sun, 7 Jun 2015 14:07:11 +0200
Subject: [PATCH] Fix bugs in dyn_mex.m under Windows
Fixes string comparison and copy and paste error.
---
matlab/utilities/general/dyn_mex.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/matlab/utilities/general/dyn_mex.m b/matlab/utilities/general/dyn_mex.m
index fe6b0555d3..a0f480312d 100644
--- a/matlab/utilities/general/dyn_mex.m
+++ b/matlab/utilities/general/dyn_mex.m
@@ -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" ' ...
--
GitLab