From 83eeafa32c280db471ea7e75a1574f4dcc46df73 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 14 Jun 2016 10:34:14 +0200 Subject: [PATCH] fix mex file compilation with MSVC. Closes #1227 --- matlab/utilities/general/dyn_mex.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/matlab/utilities/general/dyn_mex.m b/matlab/utilities/general/dyn_mex.m index a0f480312..13ca5ff3d 100644 --- a/matlab/utilities/general/dyn_mex.m +++ b/matlab/utilities/general/dyn_mex.m @@ -15,7 +15,7 @@ function dyn_mex(win_compiler,basename,force) % -% Copyright (C) 2015 Dynare Team +% Copyright (C) 2015-2016 Dynare Team % % This file is part of Dynare. % @@ -49,8 +49,9 @@ if ~exist('OCTAVE_VERSION') if ispc 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:Static" ' basename '_static.c ' basename '_static_mex.c']) + % Add /TP flag as fix for #1227 + eval(['mex -O LINKFLAGS="$LINKFLAGS /export:Dynamic" /TP ' basename '_dynamic.c ' basename '_dynamic_mex.c']) + eval(['mex -O LINKFLAGS="$LINKFLAGS /export:Static" /TP ' 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 ' ...