[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58016] branches/soc-2013-cycles_mblur: Reset branch to trunk.

Gavin Howard gavin.d.howard at gmail.com
Fri Jul 5 09:12:13 CEST 2013


Revision: 58016
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58016
Author:   gdh
Date:     2013-07-05 07:12:12 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
Reset branch to trunk. I was getting compile errors on my branch, so I 
am cleaning it out entirely. I'm going to go back through bf-blender-cvs 
archives and re-add some of the work I already did. Some of it, I might 
not add again.

Whatever the case, the branch builds fine now. I will probably do 
conflict resolution by hand from now on.

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/CMakeLists.txt
    branches/soc-2013-cycles_mblur/SConstruct
    branches/soc-2013-cycles_mblur/build_files/buildbot/slave_compile.py
    branches/soc-2013-cycles_mblur/build_files/buildbot/slave_pack.py
    branches/soc-2013-cycles_mblur/build_files/scons/config/win32-vc-config.py
    branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py
    branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py
    branches/soc-2013-cycles_mblur/intern/cycles/CMakeLists.txt
    branches/soc-2013-cycles_mblur/intern/cycles/SConscript
    branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/__init__.py
    branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py
    branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/bvh/bvh.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/SConscript
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_emission.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_jitter.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/light.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/object.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/osl.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/shader.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/shader.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/svm.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_cuda.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_cuda.h
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_math.h
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_system.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/util/util_types.h
    branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/ChainingIterators.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/addon_utils.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/anim_utils.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/anim.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/displist.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editmesh_bvh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifier.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_path_util.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_path.c
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_interface.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/resources.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/screendump.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sound/sound_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/file_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/filesel.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_iterators.c
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_types.h
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-cycles_mblur/source/creator/creator.c
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_KetsjiEngine.h

Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-07-05 05:52:49 UTC (rev 58015)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-07-05 07:12:12 UTC (rev 58016)
@@ -562,12 +562,12 @@
 if(UNIX AND NOT APPLE)
 	macro(find_package_wrapper)
 		string(TOUPPER ${ARGV0} _NAME_UPPER)
-		if(${WITH_STATIC_LIBS})
+		if(WITH_STATIC_LIBS)
 			set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
 			set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
 		endif()
 		find_package(${ARGV})
-		if(${WITH_STATIC_LIBS})
+		if(WITH_STATIC_LIBS)
 			set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
 			unset(_cmake_find_library_suffixes_back)
 		endif()
@@ -707,7 +707,7 @@
 	if(WITH_BOOST)
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			if(${WITH_STATIC_LIBS})
+			if(WITH_STATIC_LIBS)
 				set(Boost_USE_STATIC_LIBS ON)
 			endif()
 			set(Boost_USE_MULTITHREADED ON)

Modified: branches/soc-2013-cycles_mblur/SConstruct
===================================================================
--- branches/soc-2013-cycles_mblur/SConstruct	2013-07-05 05:52:49 UTC (rev 58015)
+++ branches/soc-2013-cycles_mblur/SConstruct	2013-07-05 07:12:12 UTC (rev 58016)
@@ -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-cycles_mblur/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/slave_compile.py	2013-07-05 05:52:49 UTC (rev 58015)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/slave_compile.py	2013-07-05 07:12:12 UTC (rev 58016)
@@ -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:

Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/slave_pack.py	2013-07-05 05:52:49 UTC (rev 58015)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/slave_pack.py	2013-07-05 07:12:12 UTC (rev 58016)
@@ -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-cycles_mblur/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/win32-vc-config.py	2013-07-05 05:52:49 UTC (rev 58015)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/win32-vc-config.py	2013-07-05 07:12:12 UTC (rev 58016)
@@ -16,8 +16,12 @@
 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'
@@ -30,7 +34,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
@@ -54,7 +61,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'
@@ -193,8 +203,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
@@ -225,16 +239,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 = []
@@ -251,5 +265,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:
+    BF_BUILDDIR = '..\\build\\win32-vc'
+    BF_INSTALLDIR='..\\install\\win32-vc'

Modified: branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py	2013-07-05 05:52:49 UTC (rev 58015)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/win64-vc-config.py	2013-07-05 07:12:12 UTC (rev 58016)
@@ -16,8 +16,13 @@
 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'

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list