Show
Ignore:
Timestamp:
09/05/06 17:06:25 (2 years ago)
Author:
allenb
Message:

- Fix build issues on windows

  • Only setup builds for tests if the osg libs they use are available
  • Fix linkage problem in material drawable
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/scons_build_creation/SConstruct

    r45 r52  
    9696# Create option objects 
    9797boost_options = sca_opts.Boost.Boost("boost","1.31.0",required=True) 
     98 
     99glut_libname = "glut" 
     100tiff_libname = "tiff" 
     101if "win32" == platform: 
     102   glut_libname = "glut32" 
     103   tiff_libname = "tif32" 
     104    
    98105jpeg_option = sca_opts.StandardPackageOption("jpeg","Jpeg library location", 
    99106                                             library="jpeg", required=False) 
    100107tiff_option = sca_opts.StandardPackageOption("tiff","Tiff library location", 
    101                                              library="tiff", required=False) 
     108                                             library=tiff_libname, required=False) 
    102109png_option = sca_opts.StandardPackageOption("png","PNG library location", 
    103110                                             library="png", required=False) 
    104  
    105111glut_option = sca_opts.StandardPackageOption("glut","GLUT library location", 
    106                                              library="glut", header="GL/glut.h", required=False) 
     112                                             library=glut_libname, header="GL/glut.h", required=False) 
    107113 
    108114format_options = [jpeg_option,tiff_option,png_option]