/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 498 by johnpye, Tue Apr 18 08:07:13 2006 UTC revision 499 by johnpye, Tue Apr 18 08:26:16 2006 UTC
# Line 15  if platform.system()=="Windows": Line 15  if platform.system()=="Windows":
15      default_tcl_lib = "tcl83"      default_tcl_lib = "tcl83"
16      default_tk_lib = "tk83"      default_tk_lib = "tk83"
17      default_tktable_lib = "Tktable28"      default_tktable_lib = "Tktable28"
18        default_install_assets = "glade/"
19        icon_extension = '.png'
20  else:  else:
21      default_tcl_lib = "tcl"      default_tcl_lib = "tcl"
22      default_tk_lib = "tk"      default_tk_lib = "tk"
23      default_tktable_lib = "Tktable2.8"      default_tktable_lib = "Tktable2.8"
24        default_install_assets = "$INSTALL_DATA/ascend/glade/"
25        icon_extension = '.svg'
26            
27    
28  # Package linking option  # Package linking option
# Line 202  opts.Add( Line 206  opts.Add(
206      ,"$INSTALL_PREFIX/include"      ,"$INSTALL_PREFIX/include"
207  )  )
208    
 if platform.system()=="Windows":  
     default_install_assets = "glade/"  
     icon_extension = '.png'  
 else:  
     default_install_assets = "$INSTALL_DATA/ascend/glade/"  
     icon_extension = '.svg'  
   
209  opts.Add(  opts.Add(
210      'PYGTK_ASSETS'      'PYGTK_ASSETS'
211      ,'Default location for Glade assets (placed in pygtk/interface/config.py)'      ,'Default location for Glade assets (placed in pygtk/interface/config.py)'
# Line 238  if platform.system()=="Windows": Line 235  if platform.system()=="Windows":
235  if os.environ.has_key('OSTYPE') and os.environ['OSTYPE']=='msys':  if os.environ.has_key('OSTYPE') and os.environ['OSTYPE']=='msys':
236      env = Environment(ENV=os.environ, tools=['mingw','swig','lex','yacc'])      env = Environment(ENV=os.environ, tools=['mingw','swig','lex','yacc'])
237  else:  else:
238      env = Environment(ENV=os.environ, tools=['swig','lex','yacc'])      env = Environment(ENV=os.environ)
239        Tool('lex')(env)
240        Tool('yacc')(env)
241        Tool('fortran')(env)
242        Tool('swig')(env)
243    
244  env['HAVE_LEX']=True  env['HAVE_LEX']=True
245  env['HAVE_YACC']=True  env['HAVE_YACC']=True

Legend:
Removed from v.498  
changed lines
  Added in v.499

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