/[ascend]/trunk/models/johnpye/fprops/SConscript
ViewVC logotype

Diff of /trunk/models/johnpye/fprops/SConscript

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

revision 2662 by jpye, Fri Jan 18 00:34:51 2013 UTC revision 2663 by jpye, Fri Jan 18 01:06:06 2013 UTC
# Line 22  srcs = coresrcs + fprops_env['fluids'] + Line 22  srcs = coresrcs + fprops_env['fluids'] +
22    
23  fprops_env['shobjs'] = [fprops_env.SharedObject(s) for s in srcs]  fprops_env['shobjs'] = [fprops_env.SharedObject(s) for s in srcs]
24    
25  lib = fprops_env.SharedLibrary("fprops",fprops_env['shobjs'])  fprops_env['libfprops'] = fprops_env.SharedLibrary("fprops",fprops_env['shobjs'])
26    
27  if fprops_env['WITH_ASCEND']:  if fprops_env.get('BUILDING_ASCEND') or fprops_env.get('WITH_ASCEND'):
28      lib1 = fprops_env.SharedLibrary("fprops"      asc_env = fprops_env.Clone()
29          ,['asc_fprops.c']      asc_env.AppendUnique(LIBPATH=["."])
30          ,LIBS = ["fprops","ascend"]      asc_env.AppendUnique(LIBPATH=["#"])
31          ,LIBPATH = "#"  
32        lib1 = asc_env.SharedLibrary("fprops"
33            ,['asc_fprops.c'] + fprops_env['shobjs']
34            ,LIBS = ["ascend"]
35          ,SHLIBSUFFIX = env['EXTLIB_SUFFIX']          ,SHLIBSUFFIX = env['EXTLIB_SUFFIX']
36          ,SHLIBPREFIX = env['EXTLIB_PREFIX']          ,SHLIBPREFIX = env['EXTLIB_PREFIX']
37      )      )
38    
39      lib2 = fprops_env.SharedLibrary("heatex_pinch"      lib2 = asc_env.SharedLibrary("heatex_pinch"
40          ,['asc_heatex_pinch.c']          ,['asc_heatex_pinch.c'] + fprops_env['shobjs']
41          ,LIBS = ["fprops","ascend"]          ,LIBS = ["ascend"]
         ,LIBPATH = "#"  
42          ,SHLIBSUFFIX = env['EXTLIB_SUFFIX']          ,SHLIBSUFFIX = env['EXTLIB_SUFFIX']
43          ,SHLIBPREFIX = env['EXTLIB_PREFIX']          ,SHLIBPREFIX = env['EXTLIB_PREFIX']
44      )      )
45    
46        asc_env.Depends(lib1,fprops_env['libfprops'])
47        asc_env.Depends(lib2,fprops_env['libfprops'])
48    
49      env['extfns'] += [lib1,lib2]      env['extfns'] += [lib1,lib2]
50    
51  if env['WITH_PYTHON']:  if env['WITH_PYTHON']:

Legend:
Removed from v.2662  
changed lines
  Added in v.2663

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