/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 741 by johnpye, Thu Jul 6 08:54:42 2006 UTC revision 742 by johnpye, Thu Jul 6 13:47:41 2006 UTC
# Line 411  if os.environ.get('OSTYPE')=='msys': Line 411  if os.environ.get('OSTYPE')=='msys':
411      env['IS_MINGW']=True      env['IS_MINGW']=True
412    
413  elif platform.system()=="Windows":  elif platform.system()=="Windows":
     #print "ENVIRONMENT =",os.environ  
     print "ENV PATH =",os.environ['PATH']  
       
414      env = Environment(      env = Environment(
415          ENV={          ENV={
416              'PATH':os.environ['PATH']              'PATH':os.environ['PATH']
# Line 425  elif platform.system()=="Windows": Line 422  elif platform.system()=="Windows":
422          , toolpath = ['scons']          , toolpath = ['scons']
423      )      )
424      env.Append(CPPDEFINES=['_CRT_SECURE_NO_DEPRECATE'])      env.Append(CPPDEFINES=['_CRT_SECURE_NO_DEPRECATE'])
     #env.Append(CCFLAGS=['/Za'])  
     print "INCLUDE = ",env.get('INCLUDE')  
     print "LIB = ",env.get('LIB')  
     print "\nPATH =",env['ENV'].get('PATH')  
       
425  else:  else:
426      env = Environment(      env = Environment(
427          ENV=os.environ          ENV=os.environ
# Line 437  else: Line 429  else:
429          , toolpath=['scons']          , toolpath=['scons']
430      )      )
431    
 #if platform.system()=='Windows' and env.has_key('MSVS'):  
     #print "INCLUDE =",env['ENV']['INCLUDE']  
     #print "LIB =",env['ENV']['LIB']  
     #print "PATH =",env['ENV']['PATH']  
     #env.Append(CPPPATH=env['ENV']['INCLUDE'].split(";"))  
     #env.Append(LIBPATH=env['ENV']['LIB'].split(";"))  
   
432  opts.Update(env)  opts.Update(env)
433  opts.Save('options.cache',env)  opts.Save('options.cache',env)
434    

Legend:
Removed from v.741  
changed lines
  Added in v.742

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