/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 913 by johnpye, Sat Oct 28 03:55:19 2006 UTC revision 922 by johnpye, Wed Nov 8 05:25:37 2006 UTC
# Line 188  opts.Add(PackageOption( Line 188  opts.Add(PackageOption(
188  opts.Add(  opts.Add(
189      "IDA_LIB"      "IDA_LIB"
190      ,"Libraries linked to for IDA"      ,"Libraries linked to for IDA"
191      ,['sundials_nvecserial','sundials_shared','sundials_ida','m']      ,['sundials_nvecserial','sundials_ida','m']
192  )  )
193    
194  opts.Add(  opts.Add(
# Line 478  envadditional={} Line 478  envadditional={}
478  if platform.system()=="Windows":  if platform.system()=="Windows":
479      if os.environ.get('OSTYPE')=='msys':      if os.environ.get('OSTYPE')=='msys':
480          envenv = os.environ;          envenv = os.environ;
481          tools = ['mingw','lex','yacc','fortran','swig','disttar','nsis','doxygen']          tools = ['mingw','lex','yacc','fortran','swig','disttar','nsis']
482            #TODO removed 'doxygen' for SCons 0.96.93
483          envadditional['IS_MINGW']=True          envadditional['IS_MINGW']=True
484      else:      else:
485          envenv = {          envenv = {
# Line 487  if platform.system()=="Windows": Line 488  if platform.system()=="Windows":
488              ,'LIB':os.environ['LIB']              ,'LIB':os.environ['LIB']
489              ,'MSVS_IGNORE_IDE_PATHS':1              ,'MSVS_IGNORE_IDE_PATHS':1
490          }          }
491          tools=['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']            tools=['default','lex','yacc','fortran','swig','disttar','nsis']    
492            #TODO removed 'doxygen' for SCons 0.96.93
493          envadditional['CPPDEFINES']=['_CRT_SECURE_NO_DEPRECATE']          envadditional['CPPDEFINES']=['_CRT_SECURE_NO_DEPRECATE']
494  else:  else:
495      if os.environ.get('TARGET')=='mingw':      if os.environ.get('TARGET')=='mingw':
# Line 496  else: Line 498  else:
498          envadditional['CPPPATH']=['/usr/local/lib/gcc/i386-mingw32/3.4.5/include','/usr/include']          envadditional['CPPPATH']=['/usr/local/lib/gcc/i386-mingw32/3.4.5/include','/usr/include']
499      else:      else:
500          envenv = os.environ          envenv = os.environ
501          tools=['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']          tools=['default','lex','yacc','fortran','swig','disttar','nsis']
502            #TODO removed 'doxygen' for SCons 0.96.93
503            
504            
505  env = Environment(  env = Environment(

Legend:
Removed from v.913  
changed lines
  Added in v.922

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