Commit 5a756025 authored by sebastien's avatar sebastien
Browse files

v4 matlab/mex/sources: fixed problems with compilation of simulate DLL under Linux

* Linux filenames are case sensitive, had to fixed case in #include directives
* itoa() function does not exist under Linux; replaced it by calls to sprintf()
* replaced anti-slashes by slashes in pathnames; this works under Windows


git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1677 ac1d8469-bf42-47a9-8791-bf33cf982152
parent 90cfdee3
......@@ -61,4 +61,4 @@ disp('Compiling gensylv...')
system([ COMPILE_COMMAND ' -DMATLAB -Igensylv/cc gensylv/matlab/gensylv.cpp' ...
' gensylv/cc/*.cpp ' BLAS_PATH ' ' LAPACK_PATH ]);
disp('Compiling simulate...')
system([ COMPILE_COMMAND ' -DMATLAB -Isimulate -I..\..\..\parser.src\include simulate/simulate.cc simulate/Interpreter.cc simulate/Mem_Mngr.cc simulate/SparseMatrix.cc simulate/LinBcg.cc']);
system([ COMPILE_COMMAND ' -DMATLAB -Isimulate -I../../../parser.src/include simulate/simulate.cc simulate/Interpreter.cc simulate/Mem_Mngr.cc simulate/SparseMatrix.cc simulate/linbcg.cc']);
......@@ -29,7 +29,7 @@
//#include "ExprNode.hh"
//#include "Mem_Mngr.hh"
#include "SparseMatrix.hh"
#include "LinBCG.hh"
#include "linbcg.hh"
#include "mex.h"
//#define DEBUGC
......
......@@ -17,7 +17,7 @@
* along with Dynare. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mem_mngr.hh"
#include "Mem_Mngr.hh"
Mem_Mngr::Mem_Mngr()
{
......
......@@ -564,7 +564,7 @@ void LinBCG::sprsprt()
int size=int(log10(maxi))+1;
if(size<7)
{
itoa(size+8,fmt,10);
sprintf(fmt, "%d", size+8);
pf= fmt;
pf.insert(0,"% ");
pf.append(".6f ");
......@@ -618,7 +618,7 @@ void LinBCG::sprs_sprt()
int size=int(log10(maxi))+1;
if(size<7)
{
itoa(size+8,fmt,10);
sprintf(fmt, "%d", size+8);
pf= fmt;
pf.insert(0,"% ");
pf1=pf2=pf;
......
......@@ -23,10 +23,10 @@
// use NO_COMPILER option in MODEL command //
////////////////////////////////////////////////////////////////////////
#include "Simulate.hh"
#include "simulate.hh"
#include "Interpreter.hh"
#include "Mem_Mngr.hh"
#include "LinBCG.hh"
#include "linbcg.hh"
......
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