Changeset 952

Show
Ignore:
Timestamp:
09/10/07 14:27:04 (1 year ago)
Author:
aronb
Message:

Updates for changes to windows build.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/fcptr_stable_jun07/Tutorials/SConstruct

    r698 r952  
    5151default_types    = ['optimized', 'debug'] 
    5252if GetPlatform() == 'win32': 
    53    default_types.append("hybrid") 
     53   default_types.append("debugrt") 
    5454 
    5555# ---------- Options ------------ # 
    …… 
    104104 
    105105   # Process modifications for variant combo 
    106    if combo["type"] == "debug": 
     106   if combo["type"] == "debugrt": 
    107107      env_bldr.enableDebug() 
    108108      env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DBG_DLL_RT) 
    …… 
    110110      env_bldr.enableOpt(EnvironmentBuilder.STANDARD) 
    111111      env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DLL_RT) 
    112    elif combo["type"] == "hybrid": 
     112   elif combo["type"] == "debug": 
    113113      env_bldr.enableDebug() 
    114114      env_bldr.setMsvcRuntime(EnvironmentBuilder.MSVC_MT_DLL_RT) 
    …… 
    120120      base_env.Append(CPPFLAGS = ["/wd4996",]) 
    121121 
    122       if combo["type"] == "hybrid": 
     122      if combo["type"] == "debyg": 
    123123         base_env.Append(CPPDEFINES = ['_USE_RELEASE_RUNTIME',]) 
    124124         base_env.Append(LINKFLAGS = ['/NODEFAULTLIB:msvcprtd',]) 
    …… 
    131131   if combo["type"] == "debug": 
    132132      runtime_suffix = "_d" 
    133    elif combo["type"] == "hybrid": 
    134       runtime_suffix = "_h" 
     133   elif combo["type"] == "debugrt": 
     134      runtime_suffix = "_drt" 
    135135 
    136136   # Add OpenSG libs. 

  • branches/fcptr_stable_jun07/osg-config.in

    r821 r952  
    7979   parser.add_option("--dbg",action="store_true",help="Output options for debug libraries.") 
    8080   if "win32" == sys.platform: 
    81       parser.add_option("--hybrid",action="store_true",help="Output options for hybrid libraries.") 
     81      parser.add_option("--dbg-rt",action="store_true",help="Output options for debug runtime libraries.") 
    8282 
    8383   (options, pos_args) = parser.parse_args()   
    …… 
    124124 
    125125   if "win32" == sys.platform: 
    126        if options.dbg: 
     126       if options.dbg_rt: 
    127127           lib_suffix = "_d" 
    128        elif options.hybrid: 
    129            lib_suffix = "_h" 
    130128 
    131129   config_info = ConfigInfoAdapter(libraries, lib_map, default_lib_settings,