From 650a3f6da2888c7bde3925f67692176cccd6b258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= Date: Wed, 26 Apr 2017 15:08:34 +0200 Subject: [PATCH] Point to mex/octave32 if OCtave 32bit is used on Windows platform. --- matlab/add_path_to_mex_files.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m index c7d89036d..e35d29a6b 100644 --- a/matlab/add_path_to_mex_files.m +++ b/matlab/add_path_to_mex_files.m @@ -1,6 +1,6 @@ function mexpath = add_path_to_mex_files(dynareroot, modifypath) -% Copyright (C) 2015-2016 Dynare Team +% Copyright (C) 2015-2017 Dynare Team % % This file is part of Dynare. % @@ -22,7 +22,11 @@ if nargin<2 end if exist('OCTAVE_VERSION') - mexpath = {[dynareroot '../mex/octave/']}; + if ispc() && strcmpi(computer(), 'i686-w64-mingw32') + mexpath = {[dynareroot '../mex/octave32/']}; + else + mexpath = {[dynareroot '../mex/octave/']}; + end if modifypath addpath(mexpath{1}); end