soc-2008-mxcurioni: merged changes to revision 16789
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 28 Sep 2008 17:07:08 +0000 (17:07 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 28 Sep 2008 17:07:08 +0000 (17:07 +0000)
17 files changed:
1  2 
SConstruct
config/darwin-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
source/blender/blenkernel/intern/scene.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_scene_types.h
source/blender/python/api2_2x/sceneRender.c
source/blender/render/intern/source/pipeline.c
source/blender/src/SConscript
source/blender/src/buttons_scene.c
tools/Blender.py
tools/btools.py

diff --cc SConstruct
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/btools.py
index ffdf90d5c49eb1ac882027c84adb4c2ddafefe80,8fb38646432d92535a726c9c1be70121c40ac113..aac5fe6403ebdf4af64e054655686901699151c3
@@@ -65,7 -66,6 +66,7 @@@ def validate_arguments(args, bc)
              'BF_FANCY', 'BF_QUIET',
              'BF_X264_CONFIG',
              'BF_XVIDCORE_CONFIG',
-                       'BF_WITH_BF_FREESTYLE'
++                      'WITH_BF_FREESTYLE'
              ]
  
      arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@@ -248,9 -257,9 +258,11 @@@ def read_opts(cfg, args)
          ('BF_SOLID_INC', 'Solid include path', ''),
          ('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')),
+         ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''),
 +
 +              (BoolOption('WITH_BF_FREESTYLE', 'Use Freestyle if true', 'true')),
  ##
  ##WITH_BF_NSPR = 'true'
  ##BF_NSPR = $(LCGDIR)/nspr