stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation of static/dynamic files on macOS

issue#70
Houtan Bastani 2019-04-24 14:08:32 +02:00
parent 21fe0f4bdc
commit bf89cedd88
No known key found for this signature in database
GPG Key ID: 000094FB955BE169
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/DynamicModel.cc
View File

@ -1720,8 +1720,14 @@ DynamicModel::writeDynamicCFile(const string &basename, const int order) const
if (external_functions_table.get_total_number_of_unique_model_block_external_functions())
// External Matlab function, implies Dynamic function will call mex
mDynamicModelFile << "#include <uchar.h>" << endl // For MATLAB ≤ R2011a
<< R"(#include "mex.h")" << endl;
mDynamicModelFile
#ifndef __APPLE__
<< "#include <uchar.h>" << endl // For MATLAB ≤ R2011a
#else
<< "typedef uint_least16_t char16_t;" << endl
<< "typedef uint_least32_t char32_t;" << endl // uchar.h does not exist on macOS
#endif
<< R"(#include "mex.h")" << endl;
mDynamicModelFile << "#define max(a, b) (((a) > (b)) ? (a) : (b))" << endl
<< "#define min(a, b) (((a) > (b)) ? (b) : (a))" << endl;
@ -1757,7 +1763,12 @@ DynamicModel::writeDynamicCFile(const string &basename, const int order) const
<< " */" << endl
<< endl
<< "#include <stdlib.h>" << endl
#ifndef __APPLE__
<< "#include <uchar.h>" << endl // For MATLAB ≤ R2011a
#else
<< "typedef uint_least16_t char16_t;" << endl
<< "typedef uint_least32_t char32_t;" << endl // uchar.h does not exist on macOS
#endif
<< R"(#include "mex.h")" << endl
<< endl
<< "void dynamic_resid_tt(const double *y, const double *x, int nb_row_x, const double *params, const double *steady_state, int it_, double *T);" << endl

15
src/StaticModel.cc
View File

@ -1952,8 +1952,14 @@ StaticModel::writeStaticCFile(const string &basename) const
if (external_functions_table.get_total_number_of_unique_model_block_external_functions())
// External Matlab function, implies Static function will call mex
output << "#include <uchar.h>" << endl // For MATLAB ≤ R2011a
<< R"(#include "mex.h")" << endl;
output
#ifndef __APPLE__
<< "#include <uchar.h>" << endl // For MATLAB ≤ R2011a
#else
<< "typedef uint_least16_t char16_t;" << endl
<< "typedef uint_least32_t char32_t;" << endl // uchar.h does not exist on macOS
#endif
<< R"(#include "mex.h")" << endl;
output << "#define max(a, b) (((a) > (b)) ? (a) : (b))" << endl
<< "#define min(a, b) (((a) > (b)) ? (b) : (a))" << endl;
@ -1988,7 +1994,12 @@ StaticModel::writeStaticCFile(const string &basename) const
<< " */" << endl
<< endl
<< "#include <stdlib.h>" << endl
#ifndef __APPLE__
<< "#include <uchar.h>" << endl // For MATLAB ≤ R2011a
#else
<< "typedef uint_least16_t char16_t;" << endl
<< "typedef uint_least32_t char32_t;" << endl // uchar.h does not exist on macOS
#endif
<< R"(#include "mex.h")" << endl
<< endl
<< "void static_resid_tt(const double *y, const double *x, int nb_row_x, const double *params, double *T);" << endl