From c9798a96e0f33c9a737b6d3736cc548aaeceea80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 12 Sep 2019 12:48:32 +0200
Subject: [PATCH] Fix MATLAB R2019b support
Some changes were missing in a1a4168c3
---
matlab/add_path_to_mex_files.m | 2 +-
windows/build.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m
index 95cb70e54c..0faf82cc68 100644
--- a/matlab/add_path_to_mex_files.m
+++ b/matlab/add_path_to_mex_files.m
@@ -73,7 +73,7 @@ else
end
end
else
- tmp = [dynareroot '../mex/matlab/win64-9.4-9.6/'];
+ tmp = [dynareroot '../mex/matlab/win64-9.4-9.7/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
diff --git a/windows/build.sh b/windows/build.sh
index 768abb58d5..a7b55b47cf 100755
--- a/windows/build.sh
+++ b/windows/build.sh
@@ -155,8 +155,8 @@ build_windows_matlab_mex_64_b ()
PACKAGE_STRING="dynare $VERSION"
make -j"$NTHREADS" all
x86_64-w64-mingw32-strip -- **/*.mexw64
- mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.6
- mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.6
+ mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.7
+ mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.7
}
# Create Windows DLL binaries for Octave/MinGW (32bit)
--
GitLab