Changeset 1203

Show
Ignore:
Timestamp:
05/07/08 17:05:50 (6 days ago)
Author:
patrick
Message:

Merged build changes from r822 and r823 on the trunk to fix up building the
Collada loader on this branch. This revision should not be merged back to
the trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/fcptr_stable_jun07/SConstruct

    r1065 r1203  
    4343 
    4444import OpenSG.AddOnHacks 
     45import OpenSG.ColladaOption 
    4546 
    4647from BuildInfoScanner import BuildInfoScanner 
    …… 
    330331   if ARGUMENTS.has_key("MSVS_VERSION"): 
    331332      common_env = Environment(MSVS_VERSION=ARGUMENTS["MSVS_VERSION"],  
    332                                 tools = ['default', 'doxygen'],  
    333                                 toolpath = '.') 
     333                               ENV = os.environ, 
     334                               tools = ['default', 'doxygen'],  
     335                               toolpath = '.') 
    334336   else: 
    335337      common_env = Environment(tools = ['default', 'doxygen'], toolpath = '.') 
    …… 
    347349         use_cxxlib_icc = True 
    348350 
    349       OpenSG.AddOnHacks.apply() 
    350        
    351351      common_env = Environment(ENV = os.environ, 
    352352                               tools=['gnulink', 'intelicc', 'intelicpc', 'doxygen'], 
    …… 
    507507    header = "NVPerfSDK.h", required = False) 
    508508 
     509optional_libs_options["collada"] = OpenSG.ColladaOption.ColladaOption( 
     510    "collada", "Location of the collada dom library", library = 
     511    ["collada_dae", 
     512     "collada_LIBXMLPlugin", 
     513     "collada_STLDatabase", 
     514     "collada_dom", 
     515     "collada_stdErrPlugin", 
     516     "collada_dae"], 
     517    header = "dae/daeIntegrationObject.h", required = False) 
     518 
     519optional_libs_options["xml2"] = sca_opts.StandardPackageOption( 
     520    "xml2", "Location of the xml2 library", library = "xml2", 
     521    required = False) 
     522 
    509523optional_libs_options['vtk'] = sca_opts.VTK.VTK( 
    510524   "vtk", 
    …… 
    545559feature_options["enable_new_osb_io"] = sca_opts.BoolOption( 
    546560    "enable_new_osb_io", "Enable the new OSB IO facilities.", False) 
     561 
     562feature_options["enable_collada"] = sca_opts.BoolOption( 
     563    "enable_collada", "Enable the Collada IO facilities.", False) 
    547564 
    548565feature_options["enable_scanparse_regen"] = sca_opts.BoolOption( 
    …… 
    777794                "OSG_WITH_NVPERFSDK" : optional_libs_options["NVPerfSDK"].isAvailable(), 
    778795                "OSG_WITH_VTK"       : optional_libs_options["vtk"].isAvailable(), 
     796                "OSG_WITH_COLLADA"   : optional_libs_options["collada"].isAvailable(), 
    779797                "OSG_GV_BETA"        : common_env["enable_gv_beta"] 
    780798               } 

  • branches/fcptr_stable_jun07/Source/System/FileIO/Collada/build.info

    r264 r1203  
    22# 
    33 
    4 # For now, ignore the collada loader 
    5 stop_traversal = True 
     4if option_pass: 
     5    print "Processing option pass" 
     6else: 
     7  
     8    collada_option = opts.GetOption("collada") 
     9    xml2_option    = opts.GetOption("xml2") 
     10 
     11    if not collada_option.isAvailable() and not xml2_option.isAvailable(): 
     12        stop_traversal = True 
     13    else: 
     14        library = "OSGFileIO" 
     15         
     16        libs.extend(collada_option.library) 
     17        libs.extend([xml2_option.library] ) 
     18 
     19        if collada_option.incDir: 
     20            cpppath.extend(collada_option.incDir) 
     21 
     22        if collada_option.libDir: 
     23            libpath.append(collada_option.libDir) 
     24