/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 831 by johnpye, Wed Aug 23 03:23:41 2006 UTC revision 832 by johnpye, Wed Aug 23 07:06:47 2006 UTC
# Line 461  if platform.system()!="Windows": Line 461  if platform.system()!="Windows":
461          , True          , True
462      ))      ))
463    
464    
465    
466  # TODO: OTHER OPTIONS?  # TODO: OTHER OPTIONS?
467  # TODO: flags for optimisation  # TODO: flags for optimisation
468  # TODO: turning on/off bintoken functionality  # TODO: turning on/off bintoken functionality
# Line 472  def c_escape(str): Line 474  def c_escape(str):
474          return re.sub("\\\\","/",str)          return re.sub("\\\\","/",str)
475    
476  envadditional={}  envadditional={}
477  if os.environ.get('OSTYPE')=='msys':  
478      envenv = os.environ;  if platform.system()=="Windows":
479      tools = ['mingw','lex','yacc','fortran','swig','disttar','nsis','doxygen']      if os.environ.get('OSTYPE')=='msys':
480      envadditional['IS_MINGW']=True          envenv = os.environ;
481            tools = ['mingw','lex','yacc','fortran','swig','disttar','nsis','doxygen']
482  elif platform.system()=="Windows":          envadditional['IS_MINGW']=True
483      envenv = {      else:
484          'PATH':os.environ['PATH']          envenv = {
485          ,'INCLUDE':os.environ['INCLUDE']              'PATH':os.environ['PATH']
486          ,'LIB':os.environ['LIB']              ,'INCLUDE':os.environ['INCLUDE']
487          ,'MSVS_IGNORE_IDE_PATHS':1              ,'LIB':os.environ['LIB']
488      }              ,'MSVS_IGNORE_IDE_PATHS':1
489      tools=['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']            }
490      envadditional['CPPDEFINES']=['_CRT_SECURE_NO_DEPRECATE']          tools=['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']  
491            envadditional['CPPDEFINES']=['_CRT_SECURE_NO_DEPRECATE']
492  else:  else:
493      envenv = os.environ      if os.environ.get('TARGET')=='mingw':
494      tools=['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']          envenv = os.environ
495            tools=['crossmingw','lex','yacc','disttar','nsis','doxygen']
496            envadditional['CPPPATH']=['/usr/local/lib/gcc/i386-mingw32/3.4.5/include','/usr/include']
497        else:
498            envenv = os.environ
499            tools=['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']
500        
501            
502  env = Environment(  env = Environment(
503      ENV=envenv      ENV=envenv
# Line 835  gamma(x); Line 844  gamma(x);
844  """  """
845    
846  def CheckMath(context):  def CheckMath(context):
847      context.Message('Checking for IEE math library... ')      context.Message('Checking for IEEE math library... ')
848      libsave=context.env.get('LIBS');      libsave=context.env.get('LIBS');
849      context.env.AppendUnique(LIBS=['m'])      context.env.AppendUnique(LIBS=['m'])
850      is_ok=context.TryLink(math_test_text,".c")      is_ok=context.TryLink(math_test_text,".c")
# Line 1043  conf = Configure(env Line 1052  conf = Configure(env
1052  # stdio -- just to check that compiler is behaving  # stdio -- just to check that compiler is behaving
1053    
1054  if not conf.CheckHeader('stdio.h'):  if not conf.CheckHeader('stdio.h'):
1055        print "CPPPATH =",env.get('CPPPATH')
1056      print "Did not find 'stdio.h'! Check your compiler configuration."      print "Did not find 'stdio.h'! Check your compiler configuration."
1057      Exit(1)      Exit(1)
1058    

Legend:
Removed from v.831  
changed lines
  Added in v.832

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