/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1596 by jpye, Fri Aug 17 02:28:49 2007 UTC revision 1597 by jpye, Fri Aug 17 05:26:05 2007 UTC
# Line 59  if platform.system()=="Windows": Line 59  if platform.system()=="Windows":
59            
60      default_fortran="g77"      default_fortran="g77"
61      default_f2c_lib="g2c"      default_f2c_lib="g2c"
62        
63        default_extlib_suffix = "_ascend$SHLIBSUFFIX"
64  else:  else:
65      default_tcl_lib = "tcl8.4"      default_tcl_lib = "tcl8.4"
66      default_tk_lib = "tk8.4"      default_tk_lib = "tk8.4"
# Line 97  else: Line 99  else:
99            
100      default_fortran="gfortran"      default_fortran="gfortran"
101      default_f2c_lib="gfortran"      default_f2c_lib="gfortran"
102        
103        default_extlibsuffix = "$SHLIBSUFFIX"
104    
105  opts.Add(  opts.Add(
106      'CC'      'CC'
# Line 573  opts.Add( Line 577  opts.Add(
577      ,""      ,""
578  )  )
579    
580    opts.Add(
581        'EXTLIB_SUFFIX'
582        ,"Filename suffix for ASCEND 'external libraries' (for use with IMPORT"
583        ,default_extlib_suffix
584    )
585    
586    opts.Add(
587        'EXTLIB_PREFIX'
588        ,"Filename suffix for ASCEND 'external libraries' (for use with IMPORT"
589        ,"$SHLIBPREFIX"
590    )
591    
592  #----------------------  #----------------------
593    
594  opts.Add(  opts.Add(
# Line 2154  subst_dict = { Line 2170  subst_dict = {
2170      , '@WEBHELPROOT@':'http://ascendwiki.cheme.cmu.edu/Category:Documentation'      , '@WEBHELPROOT@':'http://ascendwiki.cheme.cmu.edu/Category:Documentation'
2171      , '@SHLIBSUFFIX@':env['SHLIBSUFFIX']      , '@SHLIBSUFFIX@':env['SHLIBSUFFIX']
2172      , '@SHLIBPREFIX@':env['SHLIBPREFIX']      , '@SHLIBPREFIX@':env['SHLIBPREFIX']
2173        , '@EXTLIB_SUFFIX@':env['EXTLIB_SUFFIX']
2174        , '@EXTLIB_PREFIX@':env['EXTLIB_PREFIX']
2175      , '@ASC_ENV_TK_DEFAULT@' : '$$ASCENDDIST/tcltk'      , '@ASC_ENV_TK_DEFAULT@' : '$$ASCENDDIST/tcltk'
2176      , '@ASC_DISTDIR_REL_BIN@' : default_rel_distdir      , '@ASC_DISTDIR_REL_BIN@' : default_rel_distdir
2177      , '@PYTHON@' : python_exe      , '@PYTHON@' : python_exe
Legend:
Removed from v.1596  
changed lines
  Added in v.1597
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22