From cdbbc97fc756261af1222ab4ad370414b6090bc5 Mon Sep 17 00:00:00 2001 From: sebastien Date: Fri, 6 Nov 2009 11:32:08 +0000 Subject: [PATCH] build_matlab.m: fixes for MSVC (object files have extension .obj) git-svn-id: https://www.dynare.org/svn/dynare/trunk@3130 ac1d8469-bf42-47a9-8791-bf33cf982152 --- mex/sources/build_matlab.m | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mex/sources/build_matlab.m b/mex/sources/build_matlab.m index 5c1856564..561e4b634 100644 --- a/mex/sources/build_matlab.m +++ b/mex/sources/build_matlab.m @@ -166,7 +166,7 @@ eval([ 'mex ' COMPILE_OPTIONS ' -c -outdir ' LIBDYNAREPP_DIR ... '../../dynare++/src/nlsolve.cpp']) LIBDYNAREPP_O = ''; -tmp = dir([ LIBDYNAREPP_DIR '/*.o' ]) +tmp = dir([ LIBDYNAREPP_DIR '/*.o*' ]); % Need to support .o and .obj for i = 1:size(tmp, 1) LIBDYNAREPP_O = [ LIBDYNAREPP_O ' ' LIBDYNAREPP_DIR '/' tmp(i).name ]; end @@ -174,23 +174,23 @@ end disp('Compiling gensylv...') eval([ COMPILE_COMMAND ' -I. -I../../dynare++/sylv/cc ' ... '../../dynare++/sylv/matlab/gensylv.cpp ' ... - LIBDYNAREPP_DIR '/BlockDiagonal.o ' ... - LIBDYNAREPP_DIR '/GeneralMatrix.o ' ... - LIBDYNAREPP_DIR '/GeneralSylvester.o ' ... - LIBDYNAREPP_DIR '/IterativeSylvester.o ' ... - LIBDYNAREPP_DIR '/KronUtils.o ' ... - LIBDYNAREPP_DIR '/KronVector.o ' ... - LIBDYNAREPP_DIR '/QuasiTriangular.o ' ... - LIBDYNAREPP_DIR '/QuasiTriangularZero.o ' ... - LIBDYNAREPP_DIR '/SchurDecomp.o ' ... - LIBDYNAREPP_DIR '/SchurDecompEig.o ' ... - LIBDYNAREPP_DIR '/SimilarityDecomp.o ' ... - LIBDYNAREPP_DIR '/SylvException.o ' ... - LIBDYNAREPP_DIR '/SylvMatrix.o ' ... - LIBDYNAREPP_DIR '/SylvMemory.o ' ... - LIBDYNAREPP_DIR '/SylvParams.o ' ... - LIBDYNAREPP_DIR '/TriangularSylvester.o ' ... - LIBDYNAREPP_DIR '/Vector.o ' ... + LIBDYNAREPP_DIR '/BlockDiagonal.o* ' ... + LIBDYNAREPP_DIR '/GeneralMatrix.o* ' ... + LIBDYNAREPP_DIR '/GeneralSylvester.o* ' ... + LIBDYNAREPP_DIR '/IterativeSylvester.o* ' ... + LIBDYNAREPP_DIR '/KronUtils.o* ' ... + LIBDYNAREPP_DIR '/KronVector.o* ' ... + LIBDYNAREPP_DIR '/QuasiTriangular.o* ' ... + LIBDYNAREPP_DIR '/QuasiTriangularZero.o* ' ... + LIBDYNAREPP_DIR '/SchurDecomp.o* ' ... + LIBDYNAREPP_DIR '/SchurDecompEig.o* ' ... + LIBDYNAREPP_DIR '/SimilarityDecomp.o* ' ... + LIBDYNAREPP_DIR '/SylvException.o* ' ... + LIBDYNAREPP_DIR '/SylvMatrix.o* ' ... + LIBDYNAREPP_DIR '/SylvMemory.o* ' ... + LIBDYNAREPP_DIR '/SylvParams.o* ' ... + LIBDYNAREPP_DIR '/TriangularSylvester.o* ' ... + LIBDYNAREPP_DIR '/Vector.o* ' ... BLAS_PATH ' ' LAPACK_PATH ]); disp('Compiling bytecode...')