soc-2008-mxcurioni: merged changes to revision 17246
authorMaxime Curioni <maxime.curioni@gmail.com>
Fri, 31 Oct 2008 20:05:24 +0000 (20:05 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Fri, 31 Oct 2008 20:05:24 +0000 (20:05 +0000)
15 files changed:
1  2 
SConstruct
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/intern/bullet.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_scene_types.h
source/blender/python/SConscript
source/blender/python/api2_2x/sceneRender.c
source/blender/render/SConscript
source/blender/render/intern/source/pipeline.c
source/blender/src/CMakeLists.txt
source/blender/src/SConscript
source/blender/src/buttons_scene.c
tools/Blender.py
tools/btools.py

diff --cc SConstruct
@@@ -294,13 -300,26 +300,23 @@@ if 'clean' in B.targets
      do_clean = True
  
  if not quickie and do_clean:
+     if os.path.exists(B.doc_build_dir):
+         print B.bc.HEADER+'Cleaning doc dir...'+B.bc.ENDC
+         dirs = os.listdir(B.doc_build_dir)
+         for entry in dirs:
+             if os.path.isdir(B.doc_build_dir + entry) == 1:
+                 print "clean dir %s"%(B.doc_build_dir+entry)
+                 shutil.rmtree(B.doc_build_dir+entry)
+             else: # remove file
+                 print "remove file %s"%(B.doc_build_dir+entry)
+                 os.remove(B.root_build_dir+entry)
      if os.path.exists(B.root_build_dir):
-         print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
+         print B.bc.HEADER+'Cleaning build dir...'+B.bc.ENDC
          dirs = os.listdir(B.root_build_dir)
 -        for entry in dirs:
 -            if os.path.isdir(B.root_build_dir + entry) == 1:
 -                print "clean dir %s"%(B.root_build_dir+entry)
 -                shutil.rmtree(B.root_build_dir+entry)
 -            else: # remove file
 -                print "remove file %s"%(B.root_build_dir+entry)
 -                os.remove(B.root_build_dir+entry)
 +        for dir in dirs:
 +            if os.path.isdir(B.root_build_dir + dir) == 1:
 +                print "clean dir %s"%(B.root_build_dir+dir)
 +                shutil.rmtree(B.root_build_dir+dir)
          for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
                  'extern/xvidcore/build/generic/platform.inc']:
              if os.path.exists(confile):
Simple merge
@@@ -18,20 -17,22 +17,25 @@@ SConscript(['avi/SConscript'
              'src/SConscript',
              'nodes/SConscript'])
  
- if env['WITH_BF_YAFRAY'] == 1:
+ if env['WITH_BF_PYTHON']:
+     SConscript(['python/SConscript'])
+ if env['WITH_BF_YAFRAY']:
      SConscript(['yafray/SConscript'])
  
- if env['WITH_BF_INTERNATIONAL'] == 1:
+ if env['WITH_BF_INTERNATIONAL']:
      SConscript (['ftfont/SConscript'])
  
- if env['WITH_BF_DDS'] == 1:
+ if env['WITH_BF_DDS']:
      SConscript (['imbuf/intern/dds/SConscript'])
  
- if env['WITH_BF_OPENEXR'] == 1:
+ if env['WITH_BF_OPENEXR']:
      SConscript (['imbuf/intern/openexr/SConscript'])
  
- if env['WITH_BF_QUICKTIME'] == 1:
+ if env['WITH_BF_QUICKTIME']:
      SConscript (['quicktime/SConscript'])
 +
 +if env['WITH_BF_FREESTYLE'] == 1:
 +       SConscript(['freestyle/SConscript'])
Simple merge
@@@ -1,10 -1,10 +1,10 @@@
  #!/usr/bin/python
  Import ('env')
  
- sources = Split('BPY_interface.c BPY_menus.c') + env.Glob('api2_2x/*.c')
+ sources = env.Glob('*.c') + env.Glob('api2_2x/*.c')
  
  incs = 'api2_2x ../blenkernel ../nodes ../blenlib ../blenloader'
 -incs += ' ../render/extern/include ../radiosity/extern/include'
 +incs += ' ../render/extern/include ../radiosity/extern/include ../freestyle/intern/python'
  incs += ' ../makesdna #intern/guardedalloc #intern/bmfont ../imbuf ../include'
  incs += ' #extern/glew/include ../gpu'
  incs += ' ' + env['BF_PYTHON_INC']
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/btools.py
@@@ -1,4 -1,4 +1,3 @@@
--
  import os
  import os.path
  import SCons.Options
@@@ -66,7 -69,8 +68,9 @@@ def validate_arguments(args, bc)
              'BF_FANCY', 'BF_QUIET',
              'BF_X264_CONFIG',
              'BF_XVIDCORE_CONFIG',
+             'WITH_BF_DOCS',
+             'BF_NUMJOBS',
 +                      'WITH_BF_FREESTYLE'
              ]
  
      arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@@ -259,12 -269,10 +269,11 @@@ def read_opts(cfg, args)
          ('BF_WINTAB', 'WinTab base dir', ''),
          ('BF_WINTAB_INC', 'WinTab include dir', ''),
          ('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''),
-         (BoolOption('WITH_BF_STATICCXX', 'static link to stdc++', 'false')),
+         (BoolVariable('WITH_BF_STATICCXX', 'static link to stdc++', False)),
          ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''),
-               (BoolOption('WITH_BF_FREESTYLE', 'Use Freestyle if true', 'true')),
++              (BoolVariable('WITH_BF_FREESTYLE', 'Use Freestyle if true', True)),
  ##
- ##WITH_BF_NSPR = 'true'
+ ##WITH_BF_NSPR = True
  ##BF_NSPR = $(LCGDIR)/nspr
  ##BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
  ##BF_NSPR_LIB =