Changeset 951

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

Update for changes to SConsAddons on windows where we optimized,debug,debugrt instead of opt,hybrid,debug.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/fcptr_stable_jun07/SConstruct

    r680 r951  
    867867         inst_paths['lib'] = inst_paths['lib'] + '64' 
    868868      inst_paths["lib_inst_combo"] = inst_paths["lib"] 
    869       if GetPlatform() != "win32": 
     869      if GetPlatform() == "win32": 
     870         inst_paths["lib_inst_combo"] = pj(inst_paths["lib_inst_combo"], lib_subdir) 
     871      else: 
    870872         if "debug" == combo["type"]: 
    871873            inst_paths["lib_inst_combo"] = pj(inst_paths["lib_inst_combo"],"debug") 

  • branches/fcptr_stable_jun07/Source/SConscript

    r909 r951  
    4646 
    4747   # Define OSG_DEBUG if needed 
    48    if combo["type"] in ["debug","hybrid"]: 
     48   if combo["type"] in ["debug","debugrt"]: 
    4949      lib_env.Append(CPPDEFINES=["OSG_DEBUG",]) 
    5050 
    …… 
    5959      lib_env.Append(LIBS = ["MSVCPRT$DEBUG_CHAR", "MSVCRT$DEBUG_CHAR"]) 
    6060 
    61       if "debug" == combo["type"]: 
     61      if "debugrt" == combo["type"]: 
    6262         lib_env["DEBUG_CHAR"]='D' 
    6363      else: 
    …… 
    122122            unittest_env.Append(LIBS = ["MSVCPRT$DEBUG_CHAR", "MSVCRT$DEBUG_CHAR"]) 
    123123 
    124             if "debug" == combo["type"] or "hybrid" == combo["type"]:  
     124            if "debugrt" == combo["type"]: 
    125125                unittest_env["DEBUG_CHAR"]='D' 
    126126                unittest_env["UTDBGDIR"]='dbg'