diff --git a/Cantera/clib/SConscript b/Cantera/clib/SConscript index 31ab2d14f..21d1f10d4 100644 --- a/Cantera/clib/SConscript +++ b/Cantera/clib/SConscript @@ -3,8 +3,9 @@ from buildutils import * Import('env', 'buildTargets', 'installTargets') localenv = env.Clone() -lib = localenv.Library(pjoin('../../lib', 'clib'), - source=mglob(localenv, 'src', 'cpp')) +lib = localenv.SharedLibrary(pjoin('../../lib', 'clib'), + source=mglob(localenv, 'src', 'cpp'), + LIBS=env['cantera_libs']) inst = localenv.Install('$ct_libdir', lib) buildTargets.extend(lib) installTargets.extend(inst) diff --git a/Cantera/clib/src/clib_defs.h b/Cantera/clib/src/clib_defs.h index f3fa601f7..fe544211d 100755 --- a/Cantera/clib/src/clib_defs.h +++ b/Cantera/clib/src/clib_defs.h @@ -9,6 +9,7 @@ #ifndef CTC_DEFS_H #define CTC_DEFS_H +#include "ct_defs.h" #ifdef WIN32 // Either build as a DLL under Windows or not. diff --git a/Cantera/python/SConscript b/Cantera/python/SConscript index 2b22625a8..7ae2a14fe 100644 --- a/Cantera/python/SConscript +++ b/Cantera/python/SConscript @@ -15,7 +15,7 @@ make_setup = localenv.SubstFile('setup.py', 'setup.py.in') if env['python_package'] == 'full': pymodule = localenv.SharedLibrary('Cantera/_cantera', ['src/pycantera.cpp'], - LIBS=localenv['cantera_libs'], + LIBS='clib', SHLIBPREFIX='', SHLIBSUFFIX=gcv('SO')) buildTargets.extend(pymodule) diff --git a/SConstruct b/SConstruct index c5c7e7ea7..4949c710b 100644 --- a/SConstruct +++ b/SConstruct @@ -626,7 +626,7 @@ for header in mglob(env, 'Cantera/clib/src', 'h'): installTargets.extend(inst) ### List of libraries needed to link to Cantera ### -linkLibs = ['clib','oneD','zeroD','equil','kinetics','transport', +linkLibs = ['oneD','zeroD','equil','kinetics','transport', 'thermo','ctnumerics','ctmath','tpx', 'ctspectra','converters','ctbase']