[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [620] trunk

[<pat...@us...>]

Revision: 620
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=620&view=rev
Author:   patrickh
Date:     2007-07-31 15:22:18 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Fixed the build to work with naming convention changes in SConsAddons.

Modified Paths:
--------------
    trunk/SConstruct
    trunk/cppdom/SConscript

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-07-25 22:02:45 UTC (rev 619)
+++ trunk/SConstruct	2007-07-31 22:22:18 UTC (rev 620)
@@ -175,7 +175,7 @@
 
       inst_paths = copy.copy(base_inst_paths)
       inst_paths['libPrefix'] = pj(inst_paths['flagpollPrefix'], 'lib')
-      if GetPlatform() != "win32" and "debug" == combo["type"]:
+      if "debug" == combo["type"]:
          inst_paths["lib"] = pj(inst_paths["lib"],"debug")
          inst_paths['libPrefix'] = pj(inst_paths['libPrefix'],'debug')
       if "x64" == combo["arch"]:
@@ -227,7 +227,7 @@
          cppdom_libs     = ''
          cppdom_cxxflags = '/DCPPDOM_AUTO_LINK'
 
-         if "debug" in combo["type"] or "hybrid" in combo["type"]:
+         if "debug" in combo["type"] or "debugrt" in combo["type"]:
             cppdom_cxxflags += ' /DCPPDOM_DEBUG'
          if "shared" in combo["libtype"]:
             cppdom_cxxflags += ' /DCPPDOM_DYN_LINK'
@@ -251,7 +251,7 @@
 
       # Setup the builder for cppdom.fpc
       # XXX: This generates multiple cppdom*.fpc files instead of putting all
-      # the variation of debug/optimized/hybrid and static/shared into one
+      # the variation of debug/optimized/debugrt and static/shared into one
       # architecture-specific file!
       name_parts = ['cppdom',cppdom_version_str,arch]
       if combo["type"] != "optimized":

Modified: trunk/cppdom/SConscript
===================================================================
--- trunk/cppdom/SConscript	2007-07-25 22:02:45 UTC (rev 619)
+++ trunk/cppdom/SConscript	2007-07-31 22:22:18 UTC (rev 620)
@@ -30,7 +30,7 @@
 cppdom_lib_env = build_env.Copy()
 cppdom_lib_env.Append(CPPPATH = [inst_paths['include'],])
 
-if "debug" in combo["type"] or "hybrid" in combo["type"]:
+if "debug" in combo["type"] or "debugrt" in combo["type"]:
    cppdom_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_DEBUG"])
 
 # If should not do static only, then create static and shared libraries


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.