From d8170e4054b55dba9d38f8a702fbeb1e8ef52af7 Mon Sep 17 00:00:00 2001 From: michel <michel@ac1d8469-bf42-47a9-8791-bf33cf982152> Date: Thu, 22 May 2008 08:56:52 +0000 Subject: [PATCH] updating build.m and gensylv for Linux git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1838 ac1d8469-bf42-47a9-8791-bf33cf982152 --- mex/sources/build.m | 1 + mex/sources/gensylv/cc/SylvParams.cpp | 3 +++ mex/sources/gensylv/matlab/gensylv.cpp | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mex/sources/build.m b/mex/sources/build.m index ea016cc93..f1c0fb166 100644 --- a/mex/sources/build.m +++ b/mex/sources/build.m @@ -25,6 +25,7 @@ if strcmpi('GLNX86', computer) || strcmpi('GLNXA64', computer) ... if VERSION <= 7.4 BLAS_PATH = LAPACK_PATH; % On <= 7.4, BLAS in included in LAPACK COMPILE_OPTIONS = [ COMPILE_OPTIONS ' -DNO_BLAS_H' ]; + COMPILE_OPTIONS = [ COMPILE_OPTIONS ' -DMWTYPES_NOT_DEFINED -DNO_BLAS_H' ]; else BLAS_PATH = '-lmwblas'; end diff --git a/mex/sources/gensylv/cc/SylvParams.cpp b/mex/sources/gensylv/cc/SylvParams.cpp index 4b8e64c27..791322242 100644 --- a/mex/sources/gensylv/cc/SylvParams.cpp +++ b/mex/sources/gensylv/cc/SylvParams.cpp @@ -4,6 +4,9 @@ #include "SylvParams.h" +#ifdef MWTYPES_NOT_DEFINED +typedef int mwSize; +#endif void SylvParams::print(const char* prefix) const { diff --git a/mex/sources/gensylv/matlab/gensylv.cpp b/mex/sources/gensylv/matlab/gensylv.cpp index 6dc66e1e4..55eaca939 100644 --- a/mex/sources/gensylv/matlab/gensylv.cpp +++ b/mex/sources/gensylv/matlab/gensylv.cpp @@ -6,8 +6,7 @@ #include "mex.h" #ifdef MWTYPES_NOT_DEFINED -typedef unsigned int mwIndex; -typedef unsigned int mwSize; +typedef int mwSize; #endif #include "GeneralSylvester.h" -- GitLab