Changeset 1736

Show
Ignore:
Timestamp:
10/21/09 21:09:39 (3 years ago)
Author:
andreas
Message:

renamed Platform instance in SConstruct

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/qt_gui/SConstruct

    r1728 r1736  
    2121# defines routines to discriminate the platform 
    2222from Platform import * 
    23 platform = GetPlatform() 
    24  
    25 if platform.GetName()=="win32": 
     23platform_var = GetPlatform() 
     24 
     25if platform_var.GetName()=="win32": 
    2626    sys.argv=sys.argv[1:] # remove first '-c' under win32 
    2727 
    …… 
    6767# setup basic environment 
    6868env = Environment(options=opts, ENV = os.environ) 
    69 env.platform_name=platform.GetName() 
     69env.platform_name=platform_var.GetName() 
    7070 
    7171pkgcon_path='' 
    …… 
    8181env['TRANSLATION_UNITS']=translation_units(env) 
    8282 
    83 platform.SetLibDir(env) 
     83platform_var.SetLibDir(env) 
    8484#add pyc builder 
    8585def pyc_action(target,source,env): 
    …… 
    111111    print "done" 
    112112 
    113 platform.SetCompilerFlags(env) 
    114 platform_name = platform.GetName() 
     113platform_var.SetCompilerFlags(env) 
     114platform_name = platform_var.GetName() 
    115115 
    116116boost_suffix = env["BOOST_LIBS_SUFFIX"] 
    …… 
    155155# it is derived from the basic environment 
    156156pymod_env = env.Clone() 
    157 platform.AddPythonInclude(pymod_env, env["PYTHON_VERSION"]) 
    158 platform.AddPythonLib(pymod_env, env["PYTHON_VERSION"]) 
    159 platform.SetPymodBuilder(pymod_env) 
     157platform_var.AddPythonInclude(pymod_env, env["PYTHON_VERSION"]) 
     158platform_var.AddPythonLib(pymod_env, env["PYTHON_VERSION"]) 
     159platform_var.SetPymodBuilder(pymod_env) 
    160160pymod_env.Prepend(LIBPATH = env._stagedir+"/"+pymod_env.GetLibDir()) 
    161161pymod_env.Append(LIBS = ["iplt","iplt_geom"]) 
    …… 
    180180 
    181181pyapp_env = env.Clone() 
    182 platform.AddPythonInclude(pyapp_env, env["PYTHON_VERSION"]) 
    183 platform.AddPythonLib(pyapp_env, env["PYTHON_VERSION"]) 
     182platform_var.AddPythonInclude(pyapp_env, env["PYTHON_VERSION"]) 
     183platform_var.AddPythonLib(pyapp_env, env["PYTHON_VERSION"]) 
    184184 
    185185if do_config and not skip_config: