Changeset 52

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:

• branches/scons_build_creation/SConstruct (modified) (1 diff)
• branches/scons_build_creation/Source/Base/build.info (modified) (1 diff)
• branches/scons_build_creation/Source/SConscript (modified) (2 diffs)
• branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawable.h (modified) (1 diff)

branches/scons_build_creation/SConstruct

@@ -96 +96 @@
-# Create option objects
-boost_options = sca_opts.Boost.Boost("boost","1.31.0",required=True)
+
+glut_libname = "glut"
+tiff_libname = "tiff"
+if "win32" == platform:
+   glut_libname = "glut32"
+   tiff_libname = "tif32"
+   
-jpeg_option = sca_opts.StandardPackageOption("jpeg","Jpeg library location",
-                                             library="jpeg", required=False)
-tiff_option = sca_opts.StandardPackageOption("tiff","Tiff library location",
-"tiff"
+tiff_libname
-png_option = sca_opts.StandardPackageOption("png","PNG library location",
-                                             library="png", required=False)
-
-glut_option = sca_opts.StandardPackageOption("glut","GLUT library location",
-"glut"
+glut_libname
-
-format_options = [jpeg_option,tiff_option,png_option]

branches/scons_build_creation/Source/Base/build.info

@@ -7 +7 @@
-   osg_dep_libs = []
-   if "win32" == platform:
-
+,"glu32","winmm", "wsock32"
-      cpppath = []
-   else:

branches/scons_build_creation/Source/SConscript

@@ -10 +10 @@
-
-for (lib_name, library) in lib_map.iteritems():
+   print "Library: ", lib_name, "  tests:", library.test_files
+   
+   # ---- Setup and Build library --- #
-   lib_env = common_lib_env.Copy()
-
-   print "Library: ", lib_name, "  tests:", library.test_files
-   # XXX: Apply custom options
-   # TODO: OSG_COMPILEBASELIB
@@ -27 +29 @@
-   #   lib_env.Install(inst_paths['lib'], static_lib)
-   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-   if variant_pass == 0:      
-      lib_env.Install(inst_paths["include"], library.header_files)
+   
+   # ---- Build Tests ---- #   
+   # Verify we have all the deps for the tests
+   #   todo: How do we verify the "other test libs"
+   have_test_deps = True
+   for n in library.osg_test_libs:
+      if not lib_map.has_key(n):
+         have_test_deps = False
+         print "   missing test dep library:", n
+   
+   if have_test_deps:
+      # default settings to pass to config info   
+      default_lib_settings = LibraryInfo()
+      default_lib_settings.libpath.insert(0, inst_paths["lib"]) 
+      default_lib_settings.cpppath.insert(0, inst_paths["include"])
+      config_info = ConfigInfoAdapter(library.osg_test_libs, lib_map, default_lib_settings)
+   
+      test_env = build_env.Copy()
+      test_env.Append(CPPPATH=library.test_cpppath + config_info.getIncPath(),
+                      LIBPATH=library.test_libpath + config_info.getLibPath(),
+                      LIBS=[lib_name] + config_info.getLibs() + library.other_test_libs)
+   
+      # - Build them all in the local 'test' subdir
+      for s in library.test_files:
+         test_env.Program(target= pj("..","test",os.path.splitext(os.path.basename(s))[0]),
+                          source=s)
+   
+   # Done   

branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawable.h

@@ -56 +56 @@
- */
-
-SYSTEM
+DRAWABLE
-{
-  private: