[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39670] branches/cycles: Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Aug 24 11:44:09 CEST 2011
Revision: 39670
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39670
Author: blendix
Date: 2011-08-24 09:44:08 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39457
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/SConstruct
branches/cycles/build_files/buildbot/config/user-config-i686.py
branches/cycles/build_files/buildbot/config/user-config-player-i686.py
branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py
branches/cycles/build_files/buildbot/config/user-config-x86_64.py
branches/cycles/build_files/buildbot/slave_compile.py
branches/cycles/build_files/buildbot/slave_pack.py
branches/cycles/build_files/cmake/buildinfo.cmake
branches/cycles/build_files/cmake/macros.cmake
branches/cycles/build_files/scons/config/linuxcross-config.py
branches/cycles/build_files/scons/config/win32-mingw-config.py
branches/cycles/build_files/scons/config/win32-vc-config.py
branches/cycles/build_files/scons/config/win64-vc-config.py
branches/cycles/build_files/scons/tools/Blender.py
branches/cycles/build_files/scons/tools/btools.py
branches/cycles/doc/build_systems/scons-dev.txt
branches/cycles/doc/build_systems/scons.txt
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/extern/bullet2/src/SConscript
branches/cycles/extern/eltopo/SConscript
branches/cycles/intern/ghost/SConscript
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/cycles/release/scripts/modules/bpy_extras/mesh_utils.py
branches/cycles/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/cycles/release/scripts/startup/bl_operators/mesh.py
branches/cycles/release/scripts/startup/bl_operators/nla.py
branches/cycles/release/scripts/startup/bl_operators/object.py
branches/cycles/release/scripts/startup/bl_operators/object_align.py
branches/cycles/release/scripts/startup/bl_operators/object_quick_effects.py
branches/cycles/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/cycles/release/scripts/startup/bl_operators/sequencer.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/cycles/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/cycles/release/scripts/startup/bl_operators/wm.py
branches/cycles/release/scripts/startup/bl_ui/__init__.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_camera.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/cycles/release/scripts/startup/bl_ui/properties_particle.py
branches/cycles/release/scripts/startup/bl_ui/properties_texture.py
branches/cycles/release/scripts/startup/bl_ui/space_console.py
branches/cycles/release/scripts/startup/bl_ui/space_dopesheet.py
branches/cycles/release/scripts/startup/bl_ui/space_image.py
branches/cycles/release/scripts/startup/bl_ui/space_info.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cycles/release/scripts/templates/addon_add_object.py
branches/cycles/release/scripts/templates/operator_export.py
branches/cycles/release/scripts/templates/operator_mesh_add.py
branches/cycles/release/scripts/templates/operator_modal_view3d.py
branches/cycles/release/scripts/templates/operator_simple.py
branches/cycles/source/blender/blenkernel/intern/anim.c
branches/cycles/source/blender/blenkernel/intern/cloth.c
branches/cycles/source/blender/blenkernel/intern/multires.c
branches/cycles/source/blender/blenlib/BLI_string.h
branches/cycles/source/blender/blenlib/intern/fileops.c
branches/cycles/source/blender/blenlib/intern/jitter.c
branches/cycles/source/blender/blenlib/intern/math_geom.c
branches/cycles/source/blender/blenlib/intern/math_rotation.c
branches/cycles/source/blender/blenlib/intern/rct.c
branches/cycles/source/blender/blenlib/intern/scanfill.c
branches/cycles/source/blender/blenlib/intern/string.c
branches/cycles/source/blender/blenloader/CMakeLists.txt
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/blenpluginapi/SConscript
branches/cycles/source/blender/collada/CMakeLists.txt
branches/cycles/source/blender/collada/DocumentExporter.cpp
branches/cycles/source/blender/collada/SConscript
branches/cycles/source/blender/editors/armature/SConscript
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_draw.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_intern.h
branches/cycles/source/blender/editors/interface/interface_layout.c
branches/cycles/source/blender/editors/interface/interface_regions.c
branches/cycles/source/blender/editors/interface/interface_widgets.c
branches/cycles/source/blender/editors/mesh/SConscript
branches/cycles/source/blender/editors/object/SConscript
branches/cycles/source/blender/editors/object/object_add.c
branches/cycles/source/blender/editors/object/object_bake.c
branches/cycles/source/blender/editors/physics/SConscript
branches/cycles/source/blender/editors/render/SConscript
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/screen/SConscript
branches/cycles/source/blender/editors/screen/area.c
branches/cycles/source/blender/editors/sculpt_paint/SConscript
branches/cycles/source/blender/editors/space_buttons/buttons_context.c
branches/cycles/source/blender/editors/space_buttons/buttons_header.c
branches/cycles/source/blender/editors/space_console/space_console.c
branches/cycles/source/blender/editors/space_file/SConscript
branches/cycles/source/blender/editors/space_image/image_ops.c
branches/cycles/source/blender/editors/space_info/info_ops.c
branches/cycles/source/blender/editors/space_node/SConscript
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_node/node_header.c
branches/cycles/source/blender/editors/space_outliner/outliner_intern.h
branches/cycles/source/blender/editors/space_outliner/outliner_select.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cycles/source/blender/editors/space_view3d/drawobject.c
branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
branches/cycles/source/blender/editors/space_view3d/view3d_fly.c
branches/cycles/source/blender/editors/space_view3d/view3d_header.c
branches/cycles/source/blender/editors/space_view3d/view3d_ops.c
branches/cycles/source/blender/editors/space_view3d/view3d_select.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/cycles/source/blender/gpu/intern/gpu_material.c
branches/cycles/source/blender/gpu/intern/gpu_shader_material.glsl
branches/cycles/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/cycles/source/blender/imbuf/intern/filter.c
branches/cycles/source/blender/makesdna/DNA_sdna_types.h
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesdna/DNA_texture_types.h
branches/cycles/source/blender/makesdna/intern/CMakeLists.txt
branches/cycles/source/blender/makesdna/intern/SConscript
branches/cycles/source/blender/makesdna/intern/dna_genfile.c
branches/cycles/source/blender/makesrna/RNA_enum_types.h
branches/cycles/source/blender/makesrna/SConscript
branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
branches/cycles/source/blender/makesrna/intern/SConscript
branches/cycles/source/blender/makesrna/intern/rna_cloth.c
branches/cycles/source/blender/makesrna/intern/rna_object_force.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_sensor.c
branches/cycles/source/blender/makesrna/intern/rna_sequencer.c
branches/cycles/source/blender/makesrna/intern/rna_smoke.c
branches/cycles/source/blender/makesrna/intern/rna_texture.c
branches/cycles/source/blender/nodes/SConscript
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c
branches/cycles/source/blender/python/generic/noise_py_api.c
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/python/intern/bpy_rna.c
branches/cycles/source/blender/python/intern/bpy_util.h
branches/cycles/source/blender/render/SConscript
branches/cycles/source/blender/render/intern/source/convertblender.c
branches/cycles/source/blender/render/intern/source/envmap.c
branches/cycles/source/blender/render/intern/source/gammaCorrectionTables.c
branches/cycles/source/blender/render/intern/source/initrender.c
branches/cycles/source/blender/render/intern/source/occlusion.c
branches/cycles/source/blender/render/intern/source/pixelblending.c
branches/cycles/source/blender/render/intern/source/pixelshading.c
branches/cycles/source/blender/render/intern/source/rayshade.c
branches/cycles/source/blender/render/intern/source/render_texture.c
branches/cycles/source/blender/render/intern/source/rendercore.c
branches/cycles/source/blender/render/intern/source/renderdatabase.c
branches/cycles/source/blender/render/intern/source/shadbuf.c
branches/cycles/source/blender/render/intern/source/sss.c
branches/cycles/source/blender/render/intern/source/strand.c
branches/cycles/source/blender/render/intern/source/sunsky.c
branches/cycles/source/blender/render/intern/source/volume_precache.c
branches/cycles/source/blender/render/intern/source/volumetric.c
branches/cycles/source/blender/render/intern/source/voxeldata.c
branches/cycles/source/blender/render/intern/source/zbuf.c
branches/cycles/source/blender/windowmanager/CMakeLists.txt
branches/cycles/source/blender/windowmanager/SConscript
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/cycles/source/creator/CMakeLists.txt
branches/cycles/source/creator/buildinfo.c
branches/cycles/source/creator/creator.c
branches/cycles/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
Added Paths:
-----------
branches/cycles/build_files/scons/config/linux-config.py
branches/cycles/doc/python_api/examples/bpy.types.ID.user_clear.1.py
Removed Paths:
-------------
branches/cycles/build_files/scons/config/linux2-config.py
Property Changed:
----------------
branches/cycles/
branches/cycles/build_files/cmake/config/blender_headless.cmake
branches/cycles/build_files/cmake/config/blender_lite.cmake
branches/cycles/build_files/cmake/config/bpy_module.cmake
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-39457
+ /trunk:37695-37700
/trunk/blender:36353-39669
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/CMakeLists.txt 2011-08-24 09:44:08 UTC (rev 39670)
@@ -63,6 +63,22 @@
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
#-----------------------------------------------------------------------------
+# Set policy
+
+# see "cmake --help-policy CMP0003"
+# So library linking is more sane
+cmake_policy(SET CMP0003 NEW)
+
+# So BUILDINFO and BLENDERPATH strings are automatically quoted
+cmake_policy(SET CMP0005 NEW)
+
+# So syntax problems are errors
+cmake_policy(SET CMP0010 NEW)
+
+# Input directories must have CMakeLists.txt
+cmake_policy(SET CMP0014 NEW)
+
+#-----------------------------------------------------------------------------
# Load some macros.
include(build_files/cmake/macros.cmake)
@@ -269,9 +285,7 @@
set(WITH_HEADLESS ON)
endif()
-TEST_SSE_SUPPORT()
-
-# XXX hack
+# auto enable openimageio and boost for cycles
if(WITH_CYCLES)
set(WITH_OPENIMAGEIO ON)
set(WITH_BOOST ON)
@@ -281,6 +295,14 @@
set(WITH_BOOST ON)
endif()
+
+TEST_SSE_SUPPORT()
+
+# don't store paths to libs for portable distrobution
+if(WITH_INSTALL_PORTABLE)
+ set(CMAKE_SKIP_BUILD_RPATH TRUE)
+endif()
+
#-----------------------------------------------------------------------------
# Initialize un-cached vars, avoid unused warning
@@ -554,6 +576,9 @@
# GNU Compiler
if(CMAKE_COMPILER_IS_GNUCC)
set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+ # CLang is the same as GCC for now.
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
# Intel C++ Compiler
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
# think these next two are broken
@@ -746,11 +771,11 @@
${LIBDIR}/ffmpeg/include/msvc
)
set(FFMPEG_LIBRARIES
- ${LIBDIR}/ffmpeg/lib/avcodec-52.lib
- ${LIBDIR}/ffmpeg/lib/avformat-52.lib
- ${LIBDIR}/ffmpeg/lib/avdevice-52.lib
- ${LIBDIR}/ffmpeg/lib/avutil-50.lib
- ${LIBDIR}/ffmpeg/lib/swscale-0.lib
+ ${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+ ${LIBDIR}/ffmpeg/lib/avformat-53.lib
+ ${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+ ${LIBDIR}/ffmpeg/lib/avutil-51.lib
+ ${LIBDIR}/ffmpeg/lib/swscale-2.lib
)
endif()
@@ -899,7 +924,7 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
- set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
+ set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
endif()
Modified: branches/cycles/SConstruct
===================================================================
--- branches/cycles/SConstruct 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/SConstruct 2011-08-24 09:44:08 UTC (rev 39670)
@@ -166,6 +166,13 @@
env.SConscriptChdir(0)
+# Remove major kernel version from linux platform.
+# After Linus switched kernel to new version model this major version
+# shouldn't take much sense for building rules.
+
+if re.match('linux[0-9]+', platform):
+ platform = 'linux'
+
crossbuild = B.arguments.get('BF_CROSS', None)
if crossbuild and platform not in ('win32-vc', 'win64-vc'):
platform = 'linuxcross'
@@ -262,7 +269,7 @@
else:
print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
- # for now, Mac builders must download and install the driver framework from 3Dconnexion
+ # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
# necessary header file lives here when installed:
# /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
@@ -551,7 +558,7 @@
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
-if env['OURPLATFORM']=='linux2':
+if env['OURPLATFORM']=='linux':
iconlist = []
icontargetlist = []
@@ -630,7 +637,7 @@
if env['OURPLATFORM']=='darwin':
allinstall = [blenderinstall, plugininstall, textinstall]
-elif env['OURPLATFORM']=='linux2':
+elif env['OURPLATFORM']=='linux':
allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
else:
allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
Modified: branches/cycles/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-i686.py 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/build_files/buildbot/config/user-config-i686.py 2011-08-24 09:44:08 UTC (rev 39670)
@@ -22,7 +22,7 @@
WITH_BF_FFMPEG = True
WITH_BF_STATICFFMPEG = True
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
'${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
Modified: branches/cycles/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-player-i686.py 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/build_files/buildbot/config/user-config-player-i686.py 2011-08-24 09:44:08 UTC (rev 39670)
@@ -16,7 +16,7 @@
WITH_BF_FFMPEG = True
WITH_BF_STATICFFMPEG = True
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
'${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
Modified: branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-24 09:44:08 UTC (rev 39670)
@@ -16,7 +16,7 @@
WITH_BF_FFMPEG = True
WITH_BF_STATICFFMPEG = True
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
'${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
Modified: branches/cycles/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-x86_64.py 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/build_files/buildbot/config/user-config-x86_64.py 2011-08-24 09:44:08 UTC (rev 39670)
@@ -22,7 +22,7 @@
WITH_BF_FFMPEG = True
WITH_BF_STATICFFMPEG = True
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
'${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
Modified: branches/cycles/build_files/buildbot/slave_compile.py
===================================================================
--- branches/cycles/build_files/buildbot/slave_compile.py 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/build_files/buildbot/slave_compile.py 2011-08-24 09:44:08 UTC (rev 39670)
@@ -108,32 +108,12 @@
sys.exit(0)
else:
- bitness = '32'
- # Switch to new FFmpeg library
if builder.find('win') != -1:
- if builder.find('win32') != -1:
- LCGDIR = '#../lib/windows'
- elif builder.find('win64') != -1:
- LCGDIR = '#../lib/win64'
+ bitness = '32'
+
+ if builder.find('win64') != -1:
bitness = '64'
- all_ffmpeg_libs = ['avcodec-53',
- 'avdevice-53',
- 'avformat-53',
- 'avutil-51',
- 'swscale-2']
-
- ffmpeg_lib = []
- ffmpeg_dll = []
-
- for lib in all_ffmpeg_libs:
- ffmpeg_lib.append(lib + '.lib')
- ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll')
-
- scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8')
- scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
- scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
-
scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
Modified: branches/cycles/build_files/buildbot/slave_pack.py
===================================================================
--- branches/cycles/build_files/buildbot/slave_pack.py 2011-08-24 02:56:02 UTC (rev 39669)
+++ branches/cycles/build_files/buildbot/slave_pack.py 2011-08-24 09:44:08 UTC (rev 39670)
@@ -72,32 +72,12 @@
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
else:
- bitness = '32'
- # Switch to new FFmpeg library
if builder.find('win') != -1:
- if builder.find('win32') != -1:
- LCGDIR = '#../lib/windows'
- elif builder.find('win64') != -1:
- LCGDIR = '#../lib/win64'
+ bitness = '32'
+
+ if builder.find('win64') != -1:
bitness = '64'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list