[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38839] branches/soc-2011-onion: now builds using scon and MSVC

[Jason Wilkins]

Revision: 38839
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38839
Author:   jwilkins
Date:     2011-07-29 22:18:00 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
now builds using scon and MSVC

Modified Paths:
--------------
    branches/soc-2011-onion/build_files/scons/tools/btools.py
    branches/soc-2011-onion/extern/SConscript
    branches/soc-2011-onion/extern/brushlib/SConscript
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript

Modified: branches/soc-2011-onion/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/tools/btools.py	2011-07-29 22:05:44 UTC (rev 38838)
+++ branches/soc-2011-onion/build_files/scons/tools/btools.py	2011-07-29 22:18:00 UTC (rev 38839)
@@ -134,6 +134,7 @@
             'WITH_BF_RAYOPTIMIZATION',
             'BF_RAYOPTIMIZATION_SSE_FLAGS',
             'WITH_BF_ONSURFACEBRUSH',
+            'WITH_BF_BRUSHLIB',
             'BF_NO_ELBEEM',
             'WITH_BF_CXX_GUARDEDALLOC',
             'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
@@ -508,6 +509,8 @@
  
         (BoolVariable('WITH_BF_ONSURFACEBRUSH', 'Enable use of the "on-surface brush" for paint/sculpt.  Requires a stencil buffer, GL_depth_texture, and GLSL', True)),
 
+        (BoolVariable('WITH_BF_BRUSHLIB', 'Enable MyPaint brushlib for paint/sculpt', True)),
+
         (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)),
 
         ('BUILDBOT_BRANCH', 'Buildbot branch name', ''),

Modified: branches/soc-2011-onion/extern/SConscript
===================================================================
--- branches/soc-2011-onion/extern/SConscript	2011-07-29 22:05:44 UTC (rev 38838)
+++ branches/soc-2011-onion/extern/SConscript	2011-07-29 22:18:00 UTC (rev 38839)
@@ -24,3 +24,6 @@
 
 if env['WITH_BF_LZMA']:
     SConscript(['lzma/SConscript'])
+
+if env['WITH_BF_BRUSHLIB']:
+    SConscript(['brushlib/SConscript'])

Modified: branches/soc-2011-onion/extern/brushlib/SConscript
===================================================================
--- branches/soc-2011-onion/extern/brushlib/SConscript	2011-07-29 22:05:44 UTC (rev 38838)
+++ branches/soc-2011-onion/extern/brushlib/SConscript	2011-07-29 22:18:00 UTC (rev 38839)
@@ -1,5 +1,5 @@
-Import('env', 'python')
-env.Execute(python + ' generate.py .')
+Import('env')
+env.Execute('python extern/brushlib/generate.py extern/brushlib')
 env.Clean('.', 'brushsettings.hpp')
 env.Clean('.', Glob('*.pyc'))
 

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript	2011-07-29 22:05:44 UTC (rev 38838)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript	2011-07-29 22:18:00 UTC (rev 38839)
@@ -1,9 +1,27 @@
 #!/usr/bin/python
 Import ('env')
 
-sources = env.Glob('*.c')
-sources += ' brushlib.cpp'
 
+sources = []
+sources.append('paint_image.c')
+sources.append('paint_ops.c')
+sources.append('paint_stroke.c')
+sources.append('paint_undo.c')
+sources.append('paint_utils.c')
+sources.append('paint_vertex.c')
+sources.append('paint_mask.c')
+sources.append('paint_bspace.c')
+sources.append('paint_dab.c')
+sources.append('paint_controls.c')
+sources.append('paint_hide.c')
+sources.append('paint_meshcache.c')
+sources.append('paint_texcache.c')
+sources.append('paint_brushlib.cpp')
+sources.append('sculpt.c')
+sources.append('sculpt_undo.c')
+sources.append('sculpt_tools.c')
+
+
 defs = []
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
@@ -26,4 +44,7 @@
 if env['WITH_BF_ONSURFACEBRUSH']:
     defs.append('WITH_ONSURFACEBRUSH')
 
+if env['WITH_BF_BRUSHLIB']:
+    defs.append('WITH_BRUSHLIB')
+
 env.BlenderLib ( 'bf_editors_sculpt_paint', sources, Split(incs), defines=defs, libtype=['core'], priority=[40] )