[xml-cppdom-checkins] SF.net SVN: xml-cppdom:[681] trunk/deps/scons-addons/src/SConsAddons

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

Revision: 681
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=681&view=rev
Author:   patrickh
Date:     2011-05-01 16:04:06 +0000 (Sun, 01 May 2011)

Log Message:
-----------
Merge changes in from Revision 415 of SConsAddons.

Revision Links:
--------------
    http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=415&view=rev

Modified Paths:
--------------
    trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
    trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py

Modified: trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py
===================================================================
--- trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py	2011-05-01 15:59:54 UTC (rev 680)
+++ trunk/deps/scons-addons/src/SConsAddons/EnvironmentBuilder.py	2011-05-01 16:04:06 UTC (rev 681)
@@ -453,18 +453,19 @@
 
 # ---- MSVC ---- #
 def msvc_optimizations(bldr, env):
-   if EnvironmentBuilder.NONE == bldr.optLevel:
-      return
-
    CCFLAGS = []
    CXXFLAGS = []
    CPPDEFINES = []
-   LINKFLAGS = ["/RELEASE"]
+   LINKFLAGS = []
+   if EnvironmentBuilder.NONE == bldr.debugLevel:
+      LINKFLAGS = ["/RELEASE"]
 
    if EnvironmentBuilder.REDUCE_SIZE in bldr.optTags:
       CCFLAGS.extend(['/O1'])
    else:
-      if bldr.optLevel == EnvironmentBuilder.MINIMAL:
+      if bldr.optLevel == EnvironmentBuilder.NONE:
+         CCFLAGS.extend(['/Od'])
+      elif bldr.optLevel == EnvironmentBuilder.MINIMAL:
          CCFLAGS.extend(['/Ot', '/Og'])
       elif bldr.optLevel == EnvironmentBuilder.STANDARD:
          CCFLAGS.append(['/O2'])
@@ -473,7 +474,7 @@
          CCFLAGS.append(['/Ox'])
 
    # Fast math
-   if EnvironmentBuilder.FAST_MATH in bldr.optTags:
+   if EnvironmentBuilder.FAST_MATH in bldr.optTags and bldr.optLevel != EnvironmentBuilder.NONE:
       CCFLAGS.append(['/fp:fast'])
 
    # TODO: Do architecture specific optimizations here
@@ -489,7 +490,7 @@
    #print "Calling msvc_debug."
    if EnvironmentBuilder.NONE == bldr.debugLevel:
       return
-   env.AppendUnique(CCFLAGS = ['/Od', '/Ob0', '/Z7'],
+   env.AppendUnique(CCFLAGS = ['/Ob0', '/Z7'],
                     LINKFLAGS = ['/DEBUG'])
 
 def msvc_warnings(bldr, env):

Modified: trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py
===================================================================
--- trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py	2011-05-01 15:59:54 UTC (rev 680)
+++ trunk/deps/scons-addons/src/SConsAddons/Options/WxWidgets.py	2011-05-01 16:04:06 UTC (rev 681)
@@ -53,6 +53,7 @@
       self.available = False
       self.useCppPath = useCppPath
       self.found_cxxflags = None
+      self.found_frameworks = None
       SConsAddons.Options.PackageOption.__init__(self, name, self.baseDirKey, help_text)
       
       # configurable options
@@ -87,6 +88,9 @@
          assert self.baseDir
          assert self.wxwidgetsconfig_cmd
          return
+      else:
+         self.checkRequired("wxwidgets base dir not found");
+         return
       
       # Find cppunit-config and call it to get the other arguments
       sys.stdout.write("searching...\n");
@@ -141,6 +145,7 @@
       self.found_incs = cfg_cmd_parser.findIncludes(" --cxxflags")
       self.found_cxxflags = cfg_cmd_parser.findCXXFlags()
       self.found_libs = cfg_cmd_parser.findLibs()
+      self.found_frameworks = cfg_cmd_parser.findFrameworks()
       self.found_lib_paths = cfg_cmd_parser.findLibPaths()
 
       # Create list of flags that may be needed later
@@ -187,6 +192,9 @@
       if self.found_libs:
          env.Append(LIBS = self.found_libs)
 
+      if self.found_frameworks:
+         env.Append(FRAMEWORKS = self.found_frameworks)
+
       if self.found_cxxflags:
          env.Append(CPPDEFINES = self.found_cxxflags)
 


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