From 5bc7f8c721bf8ce0dd2078513248053addbcb0c7 Mon Sep 17 00:00:00 2001 From: "fabian.froehlich" Date: Fri, 12 May 2017 15:29:37 +0200 Subject: [PATCH] remove o2.cpp files --- @amimodel/compileC.m | 53 ++++++++++++++------------------ src/amici_interface_matlabo2.cpp | 1 - src/amicio2.cpp | 1 - src/amiwrapo2.cpp | 1 - 4 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 src/amici_interface_matlabo2.cpp delete mode 100644 src/amicio2.cpp delete mode 100644 src/amiwrapo2.cpp diff --git a/@amimodel/compileC.m b/@amimodel/compileC.m index 75e9ad57a8..0498438535 100644 --- a/@amimodel/compileC.m +++ b/@amimodel/compileC.m @@ -405,16 +405,7 @@ function compileC(this) fprintf('amici | '); - if(this.nxtrue ~= this.nx) - cstr = 'amicio2.cpp'; - else - cstr = 'amici.cpp'; - end - eval(['mex ' DEBUG COPT ... - ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ... - fullfile(this.wrap_path,'src',cstr) ' ' ... - includesstr]); - + if(isunix) if(~ismac) CLIBS = 'CLIBS="-lrt"'; @@ -429,35 +420,37 @@ function compileC(this) end end - - if(this.nxtrue ~= this.nx) - o2ext = 'o2'; - else - o2ext = ''; + if(this.nxtrue == this.nx) + eval(['mex ' DEBUG COPT ... + ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ... + fullfile(this.wrap_path,'src','amici.cpp') ' ' ... + includesstr]); end - - prefix = 'ami'; - - eval(['mex ' DEBUG ' ' COPT ... - ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ... - fullfile(this.wrap_path,'src',['amiwrap' o2ext '.cpp']) ' ' ... - includesstr]); + if(this.nxtrue == this.nx) + eval(['mex ' DEBUG ' ' COPT ... + ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ... + fullfile(this.wrap_path,'src','amiwrap.cpp') ' ' ... + includesstr]); + end - eval(['mex ' DEBUG ' ' COPT ... - ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ... - fullfile(this.wrap_path,'src',['amici_interface_matlab' o2ext '.cpp']) ' ' ... - includesstr]); + if(this.nxtrue == this.nx) + eval(['mex ' DEBUG ' ' COPT ... + ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ... + fullfile(this.wrap_path,'src','amici_interface_matlab.cpp') ' ' ... + includesstr]); + end eval(['mex ' DEBUG ' ' COPT ' ' CLIBS ... - ' -output ' fullfile(this.wrap_path,'models',this.modelname,[prefix '_' this.modelname]) ... - ' "' fullfile(this.wrap_path,'src',['amiwrap' o2ext o_suffix]) '"' ... - ' "' fullfile(this.wrap_path,'src',['amici' o2ext o_suffix]) '"' ... - ' "' fullfile(this.wrap_path,'src',['amici_interface_matlab' o2ext o_suffix]) '"' ... + ' -output ' fullfile(this.wrap_path,'models',this.modelname,['ami_' this.modelname]) ... + ' "' fullfile(this.wrap_path,'src',['amiwrap' o_suffix]) '"' ... + ' "' fullfile(this.wrap_path,'src',['amici' o_suffix]) '"' ... + ' "' fullfile(this.wrap_path,'src',['amici_interface_matlab' o_suffix]) '"' ... ' "' fullfile(this.wrap_path,'models',this.modelname,['wrapfunctions' o_suffix]) '"' ... objectsstr ... includesstr ... ]) + diff --git a/src/amici_interface_matlabo2.cpp b/src/amici_interface_matlabo2.cpp deleted file mode 100644 index 0f25c04281..0000000000 --- a/src/amici_interface_matlabo2.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "amici_interface_matlab.cpp" diff --git a/src/amicio2.cpp b/src/amicio2.cpp deleted file mode 100644 index bed1d75b4a..0000000000 --- a/src/amicio2.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "amici.cpp" \ No newline at end of file diff --git a/src/amiwrapo2.cpp b/src/amiwrapo2.cpp deleted file mode 100644 index 75ee176b26..0000000000 --- a/src/amiwrapo2.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "amiwrap.cpp" \ No newline at end of file