[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57570] branches/soc-2013-depsgraph_mt: Merging r57546 through r57569 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jun 19 10:57:03 CEST 2013
Revision: 57570
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57570
Author: nazgul
Date: 2013-06-19 08:57:02 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
Merging r57546 through r57569 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57546
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57569
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/SConstruct
branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py
branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_pack.py
branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py
branches/soc-2013-depsgraph_mt/build_files/scons/config/win64-vc-config.py
branches/soc-2013-depsgraph_mt/build_files/scons/tools/btools.py
branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt
branches/soc-2013-depsgraph_mt/intern/cycles/SConscript
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/__init__.py
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/properties.py
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
branches/soc-2013-depsgraph_mt/intern/cycles/bvh/bvh.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_math.h
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_system.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_types.h
branches/soc-2013-depsgraph_mt/release/scripts/modules/addon_utils.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/blender.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/readfile.c
branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/writefile.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/screendump.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sound/sound_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_file/filesel.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_api.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_types.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-depsgraph_mt/source/creator/creator.c
Added Paths:
-----------
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_autoexec.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/autoexec.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57545
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57569
Modified: branches/soc-2013-depsgraph_mt/SConstruct
===================================================================
--- branches/soc-2013-depsgraph_mt/SConstruct 2013-06-19 08:46:16 UTC (rev 57569)
+++ branches/soc-2013-depsgraph_mt/SConstruct 2013-06-19 08:57:02 UTC (rev 57570)
@@ -137,6 +137,8 @@
B.quickie=[]
toolset = B.arguments.get('BF_TOOLSET', None)
+vcver = B.arguments.get('MSVS_VERSION', '9.0')
+
if toolset:
print "Using " + toolset
if toolset=='mstoolkit':
@@ -148,9 +150,9 @@
btools.SetupSpawn(env)
else:
if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64', MSVC_VERSION=vcver)
else:
- env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
+ env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86', MSVC_VERSION=vcver)
if not env:
print "Could not create a build environment"
@@ -384,6 +386,8 @@
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CPPFLAGS'].append('-DWITH_AVI')
env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT')
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ env['CPPFLAGS'].append('-D_ALLOW_KEYWORD_MACROS')
if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
env['CPPFLAGS'].append('-DHAVE_STDBOOL_H')
@@ -940,7 +944,10 @@
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
- dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ pass
+ else:
+ dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
if env['WITH_BF_SNDFILE']:
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py 2013-06-19 08:46:16 UTC (rev 57569)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py 2013-06-19 08:57:02 UTC (rev 57570)
@@ -143,6 +143,8 @@
scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
if builder.find('mingw') != -1:
scons_options.append('BF_TOOLSET=mingw')
+ if builder.endswith('vc2012'):
+ scons_options.append('MSVS_VERSION=11.0')
scons_options.append('BF_NUMJOBS=1')
elif builder.find('mac') != -1:
@@ -156,7 +158,10 @@
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
if builder.find('win') != -1:
- dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')
+ if builder.endswith('vc2012'):
+ dlls = ('msvcp110.dll', 'msvcr110.dll', 'vcomp110.dll')
+ else:
+ dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')
if builder.find('win64') == -1:
dlls_path = '..\\..\\..\\redist\\x86'
else:
Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_pack.py 2013-06-19 08:46:16 UTC (rev 57569)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_pack.py 2013-06-19 08:57:02 UTC (rev 57570)
@@ -99,6 +99,8 @@
scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
if builder.find('mingw') != -1:
scons_options.append('BF_TOOLSET=mingw')
+ if builder.endswith('vc2012'):
+ scons_options.append('MSVS_VERSION=11.0')
elif builder.find('mac') != -1:
if builder.find('x86_64') != -1:
Modified: branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py 2013-06-19 08:46:16 UTC (rev 57569)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py 2013-06-19 08:57:02 UTC (rev 57570)
@@ -1,12 +1,28 @@
-LCGDIR = '#../lib/windows'
+import subprocess
+
+CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+CL_STDOUT, CL_STDERR = CL_OUT.communicate()
+
+if CL_STDERR.find("Version 15.00.") == -1:
+ VC_VERSION = '11.0'
+ LCGDIR = '#../lib/windows_vc11'
+
+else:
+ VC_VERSION = '9.0'
+ LCGDIR = '#../lib/windows'
+
LIBDIR = '${LCGDIR}'
WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR +'/ffmpeg'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+if VC_VERSION == '11.0':
+ BF_FFMPEG_LIB = 'avformat-54.lib avcodec-54.lib avdevice-54.lib avutil-52.lib avfilter-3.lib swscale-2.lib swresample-0.lib'
+ BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-54.dll ${BF_FFMPEG_LIBPATH}/avcodec-54.dll ${BF_FFMPEG_LIBPATH}/avdevice-54.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/avfilter-3.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll ${BF_FFMPEG_LIBPATH}/swresample-0.dll'
+else:
+ BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
+ BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '3.3'
@@ -19,7 +35,10 @@
WITH_BF_OPENAL = True
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+if VC_VERSION == '11.0':
+ BF_OPENAL_LIB = 'OpenAL32'
+else:
+ BF_OPENAL_LIB = 'wrap_oal'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_ICONV = True
@@ -43,7 +62,10 @@
WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl'
BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL.lib'
+if VC_VERSION == '11.0':
+ BF_SDL_LIB = 'SDL.lib dxguid.lib'
+else:
+ BF_SDL_LIB = 'SDL.lib'
BF_SDL_LIBPATH = '${BF_SDL}/lib'
BF_PTHREADS = LIBDIR + '/pthreads'
@@ -182,8 +204,12 @@
WITH_BF_BOOST = True
BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49 libboost_wave-vc90-mt-s-1_49'
-BF_BOOST_LIB_INTERNATIONAL = 'libboost_locale-vc90-mt-s-1_49'
+if VC_VERSION == '11.0':
+ BF_BOOST_LIB = 'libboost_date_time-vc110-mt-s-1_53 libboost_filesystem-vc110-mt-s-1_53 libboost_regex-vc110-mt-s-1_53 libboost_system-vc110-mt-s-1_53 libboost_thread-vc110-mt-s-1_53 libboost_wave-vc110-mt-s-1_53'
+ BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc110-mt-s-1_53'
+else:
+ BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49 libboost_wave-vc90-mt-s-1_49'
+ BF_BOOST_LIB_INTERNATIONAL = 'libboost_locale-vc90-mt-s-1_49'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
@@ -209,16 +235,16 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
+CCFLAGS = ['/nologo', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
+BGE_CXXFLAGS = ['/O2', '/Ob2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
-BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
+BF_DEBUG_CCFLAGS = ['/Zi', '/Ob0', '/Od', '/FR${TARGET}.sbr']
CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
REL_CFLAGS = []
REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2', '-DNDEBUG']
+REL_CCFLAGS = ['-O2', '/Ob2', '-DNDEBUG']
C_WARN = []
CC_WARN = []
@@ -235,5 +261,9 @@
BF_BSC=False
-BF_BUILDDIR = '..\\build\\win32-vc'
-BF_INSTALLDIR='..\\install\\win32-vc'
+if VC_VERSION == '11.0':
+ BF_BUILDDIR = '..\\build\\win32-vc11'
+ BF_INSTALLDIR='..\\install\\win32-vc11'
+else:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list