From ff878fc8263dd47be128c58ac28c4416f1218ffd Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 14 Dec 2011 05:55:01 +0000 Subject: [PATCH] "equil" compilation now includes C source files This fixes compilation with the VCS non-ideal phase option --- Cantera/src/SConscript | 2 +- SConstruct | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cantera/src/SConscript b/Cantera/src/SConscript index 7d557761e..e9c4098ae 100644 --- a/Cantera/src/SConscript +++ b/Cantera/src/SConscript @@ -6,7 +6,7 @@ localenv = env.Clone() # (subdir, library name, (file extensions)) libs = [('base', 'ctbase', ['cpp']), ('thermo', 'thermo', ['cpp']), - ('equil', 'equil', ['cpp']), + ('equil', 'equil', ['cpp','c']), ('converters', 'converters', ['cpp']), ('numerics', 'ctnumerics', ['cpp']), ('kinetics', 'kinetics', ['cpp']), diff --git a/SConstruct b/SConstruct index a15ff9045..bb884afc5 100644 --- a/SConstruct +++ b/SConstruct @@ -195,7 +195,7 @@ opts.AddVariables( BoolVariable( 'with_vcsnonideal', """Enable vcs equilibrium package for nonideal phases""", - False), + True), BoolVariable( 'enable_transport', 'Enable transport property calculations.', @@ -507,7 +507,7 @@ cdefine('WITH_STOICH_SUBSTANCE', 'with_stoich_substance') cdefine('WITH_SEMICONDUCTOR', 'with_semiconductor') cdefine('WITH_PRIME', 'with_prime') cdefine('H298MODIFY_CAPABILITY', 'with_n298modify_capability') -cdefine('WITH_PURE_FLUIDS', 'with_pure_fluids5A') +cdefine('WITH_PURE_FLUIDS', 'with_pure_fluids') cdefine('WITH_HTML_LOGS', 'with_html_log_files') cdefine('WITH_VCSNONIDEAL', 'with_vcsnonideal')