[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42157] trunk/blender/extern/libmv/ SConscript: libmv: don't replace flags with rel_flags but add, to preserve all flags

[jens verwiebe]

Revision: 42157
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42157
Author:   jensverwiebe
Date:     2011-11-25 11:31:51 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
libmv: don't replace flags with rel_flags but add, to preserve all flags

Modified Paths:
--------------
    trunk/blender/extern/libmv/SConscript

Modified: trunk/blender/extern/libmv/SConscript
===================================================================
--- trunk/blender/extern/libmv/SConscript	2011-11-25 09:22:36 UTC (rev 42156)
+++ trunk/blender/extern/libmv/SConscript	2011-11-25 11:31:51 UTC (rev 42157)
@@ -46,16 +46,16 @@
             defs.append('NDEBUG')
     else:
         if not env['BF_DEBUG']:
-            cflags_libmv = Split(env['REL_CFLAGS'])
-            ccflags_libmv = Split(env['REL_CCFLAGS'])
-            cxxflags_libmv = Split(env['REL_CXXFLAGS'])
+            cflags_libmv += Split(env['REL_CFLAGS'])
+            ccflags_libmv += Split(env['REL_CCFLAGS'])
+            cxxflags_libmv += Split(env['REL_CXXFLAGS'])
 else:
     src += env.Glob("third_party/glog/src/*.cc")
     incs += ' ./third_party/glog/src'
     if not env['BF_DEBUG']:
-        cflags_libmv = Split(env['REL_CFLAGS'])
-        ccflags_libmv = Split(env['REL_CCFLAGS'])
-        cxxflags_libmv = Split(env['REL_CXXFLAGS'])
+        cflags_libmv += Split(env['REL_CFLAGS'])
+        ccflags_libmv += Split(env['REL_CCFLAGS'])
+        cxxflags_libmv += Split(env['REL_CXXFLAGS'])
 
 incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'