Changeset 495
- Timestamp:
- 01/26/07 16:16:46 (2 years ago)
- Files:
-
- trunk/Tools/scons-build/LibraryUtils.py (modified) (3 diffs, 1 prop)
- trunk/osg-config.in (modified) (4 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Tools/scons-build/LibraryUtils.py
- Property svn:eol-style set to native
r391 r495 88 88 """ 89 89 def __init__(self, libs, libMap, defaultMergedLib=None, 90 incprefix="-I", libprefix="-l", libpathprefix="-L", osg_lib_suffix=""): 90 incprefix="-I", libprefix="-l", libpathprefix="-L", 91 osg_lib_suffix="", osg_lib_ext=""): 91 92 92 93 libraries = copy.copy(libs) # Make a copy so we don't modify the original … … 113 114 self.libpathprefix = libpathprefix 114 115 self.osg_lib_suffix = osg_lib_suffix 116 self.osg_lib_ext = osg_lib_ext 115 117 116 118 def getIncPath(self): … … 119 121 return " ".join(["%s%s"%(self.incprefix,p) for p in self.merged_lib.cpppath]) 120 122 def getLibs(self): 121 osg_lib_list = ["%s%s"%(l,self.osg_lib_suffix) for l in self.merged_lib.osg_dep_libs] 122 return osg_lib_list + self.merged_lib.libs 123 osg_lib_list = ["%s%s%s"%(l,self.osg_lib_suffix, self.osg_lib_ext) for l in self.merged_lib.osg_dep_libs] 124 deps_lib_list = ["%s%s"%(l,self.osg_lib_ext) for l in self.merged_lib.libs] 125 return osg_lib_list + deps_lib_list 123 126 def getLibsStr(self): 124 127 return " ".join(["%s%s"%(self.libprefix,l) for l in self.getLibs()]) trunk/osg-config.in
- Property svn:eol-style set to native
r80 r495 49 49 def_incprefix = "/I" 50 50 def_libprefix = "" 51 def_libext = ".lib" 51 52 def_libpathprefix = "/LIBPATH:" 52 53 else: 53 54 def_incprefix = "-I" 54 55 def_libprefix = "-l" 56 def_libext = "" 55 57 def_libpathprefix = "-L" 56 58 … … 70 72 parser.add_option("--lib-prefix",default=def_libprefix, 71 73 help="Linker lib prefix to use. (%s)"%def_libprefix) 74 parser.add_option("--lib-ext",default=def_libext, 75 help="Linker lib subfix to use. (%s)"%def_libext) 72 76 parser.add_option("--libpath-prefix",default=def_libpathprefix, 73 77 help="Linker library path prefix to use. (%s)"%def_libpathprefix) … … 107 111 options.inc_prefix = "" 108 112 options.lib_prefix = "" 113 options.lib_ext = "" 109 114 options.libpath_prefix = "" 110 115 … … 114 119 default_lib_settings.cpppath.insert(0, inst_inc_path) 115 120 config_info = ConfigInfoAdapter(libraries, lib_map, default_lib_settings, 116 options.inc_prefix, options.lib_prefix, options.libpath_prefix) 121 options.inc_prefix, options.lib_prefix, options.libpath_prefix, 122 "", options.lib_ext) 117 123 118 124 if options.cflags:
