Commit cdbbc97f authored by sebastien's avatar sebastien
Browse files

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
parent 93b4e4c7
......@@ -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...')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment