Changeset 532

Timestamp:

02/12/07 03:15:52 (2 years ago)

Author:

vossg

Message:

fixed : apply additional libs/includes first

osg-config use win path for windows

Files:

• trunk/SConstruct (modified) (4 diffs)
• trunk/osg-config.in (modified) (4 diffs)

trunk/SConstruct

@@ -233 +233 @@
-   def completeProcess(self, env):
-      if self.value:
-':'
+os.pathsep
-            exec("env.Append(%s = [i])" % self.key)
-
@@ -731 +731 @@
-#    This should not require any changes unless a new option group is added.
-
+for opt in extra_libs_options.itervalues():
+    if opt not in image_format_options.itervalues():
+        opts.AddOption(opt)
+
-opts.AddOption(sca_opts.SeparatorOption("\nBuild/Install settings"))
-for opt in build_options.itervalues():
@@ -749 +753 @@
-    opts.AddOption(opt)
-
-for opt in extra_libs_options.itervalues():
-    if opt not in image_format_options.itervalues():
-        opts.AddOption(opt)
-
-opts.AddOption(sca_opts.SeparatorOption("\nAdvanced options"))
@@ -978 +979 @@
-         lib_map_str = pprint.pformat(lib_map_build_list)
-
+         if "win32" == platform:
+             inst_inc_path = inst_paths["include"].replace('\\','\\\\')
+             inst_prefix   = common_env["prefix"].replace('\\','\\\\')
+             inst_lib_path = inst_paths["lib"].replace('\\','\\\\')
+         else:
+             inst_inc_path = inst_paths["include"]
+             inst_prefix   = common_env["prefix"]
+             inst_lib_path = inst_paths["lib"]
+
-         submap = {'@LIB_MAP_STR@'      : lib_map_str,
-common_env["prefix"]
-paths["lib"]
-paths["include"]
+inst_prefix
+lib_path
+inc_path
-                   '@VERSION@'          : opensg_version_string,
-                   '@LIBRARY_UTIL_SRC@' : file(pj('Tools','scons-build','LibraryUtils.py')).read()}

trunk/osg-config.in

@@ -80 +80 @@
-
-   (options, pos_args) = parser.parse_args()  
-
+
-   # Process simple single options
-   if options.prefix:
@@ -88 +88 @@
-      print version
-      return
-
+
-   # Try to find libname
-   # - Try given name and name with OSG or OSGWindow prefix
@@ -101 +101 @@
-               break
-
-
+
-   # Make sure we have libraries
-   if len(libraries) == 0:
@@ -113 +113 @@
-      options.lib_ext = ""
-      options.libpath_prefix = ""
-
+
-   # Create a configuration adapter for the required library
-   default_lib_settings = LibraryInfo()
-   default_lib_settings.libpath.insert(0, inst_lib_path) 
-   default_lib_settings.cpppath.insert(0, inst_inc_path)
+
+   lib_suffix = ""
+
+   if options.dbg:
+       lib_suffix = "_d"
+
+
-   config_info = ConfigInfoAdapter(libraries, lib_map, default_lib_settings,
-options.inc_prefix, options.lib_prefix, options.libpath_prefix,
-""
-
+              options.inc_prefix, options.lib_prefix, 
+              options.libpath_prefix, lib_suffix
+
-   if options.cflags:
-      print config_info.getIncPathStr()