/[ascend]/branches/jacob/models/johnpye/fprops/SConscript
ViewVC logotype

Diff of /branches/jacob/models/johnpye/fprops/SConscript

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2987 by jacob, Fri Jun 5 19:31:23 2015 UTC revision 2988 by jacob, Tue Jun 30 04:00:24 2015 UTC
# Line 16  fprops_env.Depends("fluids.c","fluids/fl Line 16  fprops_env.Depends("fluids.c","fluids/fl
16  coresrcs = ['fprops.c', 'color.c', 'refstate.c', 'ideal.c', 'helmholtz.c', 'pengrob.c'  coresrcs = ['fprops.c', 'color.c', 'refstate.c', 'ideal.c', 'helmholtz.c', 'pengrob.c'
17      , 'sat.c', 'derivs.c', 'solve_ph.c', 'solve_Tx.c', 'solve_px.c', 'fluids.c','cp0.c'      , 'sat.c', 'derivs.c', 'solve_ph.c', 'solve_Tx.c', 'solve_px.c', 'fluids.c','cp0.c'
18      , 'zeroin.c','cubicroots.c', 'visc.c', 'thcond.c', 'mixtures/init_mixfuncs.c'      , 'zeroin.c','cubicroots.c', 'visc.c', 'thcond.c', 'mixtures/init_mixfuncs.c'
19        , 'mixtures/mixture_prepare.c', 'mixtures/mixture_generics.c'
20  ]  ]
21    
22  srcs = coresrcs + fprops_env['fluids'] + ['fluids/_rpp.c']  srcs = coresrcs + fprops_env['fluids'] + ['fluids/_rpp.c']
# Line 43  if fprops_env.get('BUILDING_ASCEND') or Line 44  if fprops_env.get('BUILDING_ASCEND') or
44          ,SHLIBPREFIX = env['EXTLIB_PREFIX']          ,SHLIBPREFIX = env['EXTLIB_PREFIX']
45      )      )
46    
47        lib3 = asc_env.SharedLibrary("idealsol"
48            ,['mixtures/asc_idealsolution.c'] + fprops_env['shobjs']
49            ,LIBS = ["ascend"]
50            ,SHLIBSUFFIX = env['EXTLIB_SUFFIX']
51            ,SHLIBPREFIX = env['EXTLIB_PREFIX']
52        )
53    
54      #asc_env.Depends(lib1,fprops_env['libfprops'])      #asc_env.Depends(lib1,fprops_env['libfprops'])
55      #asc_env.Depends(lib2,fprops_env['libfprops'])      #asc_env.Depends(lib2,fprops_env['libfprops'])
56        #asc_env.Depends(lib3,fprops_env['libfprops'])
57    
58      env['extfns'] += [lib1,lib2]      env['extfns'] += [lib1,lib2,lib3]
59        # env['extfns'] += [lib3]
60    
61  if env['WITH_PYTHON']:  if env['WITH_PYTHON']:
62      fprops_env.SConscript('python/SConscript',['fprops_env'])      fprops_env.SConscript('python/SConscript',['fprops_env'])

Legend:
Removed from v.2987  
changed lines
  Added in v.2988

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22