Changeset 35

Show
Ignore:
Timestamp:
08/21/06 00:43:59 (2 years ago)
Author:
dirk
Message:

Adjust SCons libraries to configure libraries. Should match now.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/scons_build_creation/Source/Base/build.info

    r21 r35  
    77   osg_dep_libs = [] 
    88   if "win32" == platform: 
    9       libs = [] 
     9      libs = ['opengl32'] 
    1010      cpppath = [] 
    1111   else: 
    12       libs = ["pthread","dl","m"] 
     12      libs = ["GL","pthread","dl","m"] 
    1313      cpppath = [] 

  • branches/scons_build_creation/Source/System/FileIO/build.info

    r21 r35  
    55else: 
    66   library = "OSGFileIO" 
    7    osg_dep_libs = ['OSGBase', 'OSGSystem'] 
     7   osg_dep_libs = ['OSGBase', 'OSGSystem', 'OSGGroup', 'OSGDrawable', 'OSGState'] 
     8 
     9   # Tests' dependencies 
     10 
     11   test_libs = [] 
     12   test_cpppath = [] 
     13   test_libpath = [] 

  • branches/scons_build_creation/Source/System/Image/FileIO/build.info

    r34 r35  
    77   osg_lib_deps = ['OSGBase',"OSGSystem"] 
    88 
     9   # Tests' dependencies 
     10 
     11   test_libs = [ 'OSGWindowGLUT' ] 
     12   test_cpppath = [] 
     13   test_libpath = [] 
     14 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/build.info

    r21 r35  
    66   library = "OSGDrawable" 
    77   osg_dep_libs = ['OSGBase', 'OSGSystem', 'OSGState'] 
     8 
     9   # Tests' dependencies 
     10 
     11   test_libs = [ 'OSGGroup', 'OSGFileIO', 'OSGWindow', 'OSGUtil' ] 
     12   test_cpppath = [] 
     13   test_libpath = [] 

  • branches/scons_build_creation/Source/System/NodeCores/Groups/build.info

    r34 r35  
    99   # Tests' dependencies 
    1010 
    11    test_libs = [ 'OSGWindowGLUT' ] 
     11   test_libs = [ 'OSGWindowGLUT', 'OSGRenderTraversal' ] 
    1212   test_cpppath = [] 
    1313   test_libpath = [] 

  • branches/scons_build_creation/Source/System/State/build.info

    r21 r35  
    66   library = "OSGState" 
    77   osg_dep_libs = ['OSGBase', 'OSGSystem'] 
     8 
     9   # Tests' dependencies 
     10 
     11   test_libs = [ 'OSGWindowGLUT' ] 
     12   test_cpppath = [] 
     13   test_libpath = [] 

  • branches/scons_build_creation/Source/System/Text/build.info

    r34 r35  
    66   library = "OSGText" 
    77   osg_dep_libs = ['OSGBase',"OSGSystem"]    
     8 
     9   # Tests' dependencies 
     10 
     11   test_libs = [ 'OSGWindowGLUT', 'OSGDrawable' ] 
     12   test_cpppath = [] 
     13   test_libpath = [] 

  • branches/scons_build_creation/Source/System/Window/build.info

    r34 r35  
    66   library = "OSGWindow" 
    77   osg_dep_libs = ['OSGBase',"OSGSystem"] 
     8 
     9   # Tests' dependencies 
     10 
     11   test_libs = [ 'OSGGroup', 'OSGDrawable' ] 
     12   test_cpppath = [] 
     13   test_libpath = [] 

  • branches/scons_build_creation/Source/System/build.info

    r34 r35  
    1010    
    1111   library = "OSGSystem" 
    12    osg_dep_libs = ['OSGBase'] #, 'OSGText'] 
    13     
    14    if "win32" == platform: 
    15       libs = ['opengl32'] 
    16       cpppath = [] 
    17    else: 
    18       libs = ['GL'] 
    19       cpppath = [] 
     12   osg_dep_libs = ['OSGBase'] 
    2013     
    2114   for option in [jpeg_option, tiff_option, png_option]: 
    …… 
    2922   # Tests' dependencies 
    3023 
    31    test_libs = [ 'OSGGroup', 'OSGDrawable', 'OSGFileIO', 'OSGWindow', 'OSGWindowX' ] 
     24   test_libs = [ 'OSGGroup', 'OSGDrawable', 'OSGFileIO', 'OSGWindow',  
     25                 'OSGWindowX', 'OSGUtil', 'OSGText' ] 
    3226   test_cpppath = [] 
    3327   test_libpath = [] 
    …… 
    4135            test_libpath.append(option.libDir) 
    4236   
    43    # hack until the dependency loop is fixed 
    44    test_libs += [ 'OSGText' ] 
    45    

  • branches/scons_build_creation/Source/WindowSystem/GLUT/build.info

    r34 r35  
    99   # Tests' dependencies 
    1010 
    11    test_libs = [ 'OSGWindow' ] 
     11   test_libs = [ 'OSGWindow', 'OSGRenderTraversal' ] 
    1212   test_cpppath = [] 
    1313   test_libpath = []