Changeset 57

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

More fixes for windows.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/scons_build_creation/Source/SConscript

    r52 r57  
    1616 
    1717   # XXX: Apply custom options 
    18    # TODO: OSG_COMPILEBASELIB 
     18   # 
     19   # Add the define needed for declspec to know what library we are building 
    1920   compile_define = "OSG_COMPILE%sLIB"%lib_name[3:].upper() 
    2021   lib_env.Append(CPPDEFINES=[compile_define]) 
    2122     
    2223   if "shared" in combo["libtype"]: 
    23       shared_lib = lib_env.SharedLibrary(lib_name + shared_lib_suffix, library.source_files, \ 
    24                          LIBS=library.osg_dep_libs + library.libs, LIBPATH=inst_paths['lib']) 
     24      shared_lib = lib_env.SharedLibrary(lib_name + shared_lib_suffix, library.source_files, 
     25                         LIBS=[l+shared_lib_suffix for l in library.osg_dep_libs] + library.libs,  
     26                         LIBPATH=inst_paths['lib']) 
    2527      lib_env.Install(inst_paths['lib'], shared_lib) 
    2628