[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45969] branches/soc-2011-cucumber: Merged revisions 45910-45967 from trunk/blender
Daniel Stokes
kupomail at gmail.com
Thu Apr 26 05:11:18 CEST 2012
Revision: 45969
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45969
Author: kupoman
Date: 2012-04-26 03:11:15 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Merged revisions 45910-45967 from trunk/blender
Modified Paths:
--------------
branches/soc-2011-cucumber/CMakeLists.txt
branches/soc-2011-cucumber/SConstruct
branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
branches/soc-2011-cucumber/build_files/scons/tools/btools.py
branches/soc-2011-cucumber/extern/bullet2/src/SConscript
branches/soc-2011-cucumber/extern/carve/SConscript
branches/soc-2011-cucumber/extern/carve/bundle.sh
branches/soc-2011-cucumber/extern/eltopo/SConscript
branches/soc-2011-cucumber/extern/libmv/SConscript
branches/soc-2011-cucumber/extern/libmv/bundle.sh
branches/soc-2011-cucumber/extern/libmv/libmv/numeric/numeric.h
branches/soc-2011-cucumber/extern/libmv/third_party/glog/src/windows/port.cc
branches/soc-2011-cucumber/extern/libmv/third_party/glog/src/windows/port.h
branches/soc-2011-cucumber/intern/SConscript
branches/soc-2011-cucumber/intern/audaspace/SConscript
branches/soc-2011-cucumber/intern/boolop/SConscript
branches/soc-2011-cucumber/intern/cycles/SConscript
branches/soc-2011-cucumber/intern/ghost/SConscript
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-cucumber/intern/opennl/SConscript
branches/soc-2011-cucumber/intern/utfconv/SConscript
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-cucumber/release/windows/installer/00.sconsblender.nsi
branches/soc-2011-cucumber/source/SConscript
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_report.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_tessmesh.h
branches/soc-2011-cucumber/source/blender/blenkernel/SConscript
branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/collision.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/idprop.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/mball.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/text.c
branches/soc-2011-cucumber/source/blender/blenlib/SConscript
branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
branches/soc-2011-cucumber/source/blender/blenpluginapi/SConscript
branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2011-cucumber/source/blender/editors/armature/SConscript
branches/soc-2011-cucumber/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-cucumber/source/blender/editors/include/ED_mesh.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_uvedit.h
branches/soc-2011-cucumber/source/blender/editors/include/UI_interface.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-cucumber/source/blender/editors/mesh/SConscript
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-cucumber/source/blender/editors/object/SConscript
branches/soc-2011-cucumber/source/blender/editors/object/object_group.c
branches/soc-2011-cucumber/source/blender/editors/physics/SConscript
branches/soc-2011-cucumber/source/blender/editors/render/SConscript
branches/soc-2011-cucumber/source/blender/editors/screen/SConscript
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/SConscript
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_file/SConscript
branches/soc-2011-cucumber/source/blender/editors/space_image/SConscript
branches/soc-2011-cucumber/source/blender/editors/space_image/space_image.c
branches/soc-2011-cucumber/source/blender/editors/space_node/SConscript
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/SConscript
branches/soc-2011-cucumber/source/blender/editors/space_text/text_python.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/SConscript
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_generics.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-cucumber/source/blender/gpu/SConscript
branches/soc-2011-cucumber/source/blender/imbuf/SConscript
branches/soc-2011-cucumber/source/blender/imbuf/intern/jp2.c
branches/soc-2011-cucumber/source/blender/makesdna/intern/SConscript
branches/soc-2011-cucumber/source/blender/makesrna/SConscript
branches/soc-2011-cucumber/source/blender/makesrna/intern/SConscript
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-cucumber/source/blender/nodes/SConscript
branches/soc-2011-cucumber/source/blender/python/SConscript
branches/soc-2011-cucumber/source/blender/render/SConscript
branches/soc-2011-cucumber/source/blender/windowmanager/SConscript
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2011-cucumber/source/creator/CMakeLists.txt
branches/soc-2011-cucumber/source/gameengine/Converter/SConscript
branches/soc-2011-cucumber/source/gameengine/Ketsji/SConscript
branches/soc-2011-cucumber/source/gameengine/VideoTexture/SConscript
branches/soc-2011-cucumber/source/tools/uncrustify_clean.sh
Added Paths:
-----------
branches/soc-2011-cucumber/build_files/scons/config/win64-mingw-config.py
branches/soc-2011-cucumber/extern/carve/patches/mingw_w64.patch
branches/soc-2011-cucumber/extern/libmv/patches/mingw_w64_support.patch
Property Changed:
----------------
branches/soc-2011-cucumber/
branches/soc-2011-cucumber/build_files/
branches/soc-2011-cucumber/extern/
branches/soc-2011-cucumber/intern/
branches/soc-2011-cucumber/release/
branches/soc-2011-cucumber/source/blender/
Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:36829-40545,40632-45910
/trunk/blender/source/darwin:41227-41228
+ /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
/trunk/blender:36829-40545,40632-45967
/trunk/blender/source/darwin:41227-41228
Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt 2012-04-26 03:10:21 UTC (rev 45968)
+++ branches/soc-2011-cucumber/CMakeLists.txt 2012-04-26 03:11:15 UTC (rev 45969)
@@ -194,12 +194,7 @@
option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
-if(MINGW)
- set(PLATFORM_DEFAULT ON)
-else()
- set(PLATFORM_DEFAULT OFF)
-endif()
-option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" ${PLATFORM_DEFAULT})
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
unset(PLATFORM_DEFAULT)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
@@ -373,8 +368,8 @@
"line if youre a developer who wants to add support.")
endif()
- if((WITH_MINGW64) AND (WITH_CYCLES OR WITH_OPENCOLLADA OR WITH_LIBMV OR WITH_CODEC_FFMPEG))
- message(FATAL_ERROR "MINGW64 still doesn't support: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_OPENCOLLADA/WITH_LIBMV/WITH_CODEC_FFMPEG")
+ if((WITH_MINGW64) AND (WITH_OPENCOLLADA OR WITH_CODEC_FFMPEG))
+ message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_CODEC_FFMPEG")
endif()
endif()
@@ -1013,9 +1008,9 @@
if(WITH_MINGW64)
#Yes, the point for MinGW64 is moar optimization by default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -O3")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lsetupapi -lpthread")
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
endif()
Modified: branches/soc-2011-cucumber/SConstruct
===================================================================
--- branches/soc-2011-cucumber/SConstruct 2012-04-26 03:10:21 UTC (rev 45968)
+++ branches/soc-2011-cucumber/SConstruct 2012-04-26 03:11:15 UTC (rev 45969)
@@ -170,7 +170,7 @@
if env['CC'] in ['cl', 'cl.exe']:
platform = 'win64-vc' if bitness == 64 else 'win32-vc'
elif env['CC'] in ['gcc']:
- platform = 'win32-mingw'
+ platform = 'win64-mingw' if bitness == 64 else 'win32-mingw'
env.SConscriptChdir(0)
@@ -782,6 +782,34 @@
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls
+if env['OURPLATFORM'] == 'win64-mingw':
+ dllsources = []
+
+ if env['WITH_BF_PYTHON']:
+ if env['BF_DEBUG']:
+ dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
+ else:
+ dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
+
+ if env['WITH_BF_FFMPEG']:
+ dllsources += env['BF_FFMPEG_DLL'].split()
+
+ if env['WITH_BF_OPENAL']:
+ dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
+ dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+
+ if env['WITH_BF_SNDFILE']:
+ dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
+
+ if env['WITH_BF_SDL']:
+ dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
+
+ dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
+ dllsources.append('#source/icons/blender.exe.manifest')
+
+ windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
+ allinstall += windlls
+
installtarget = env.Alias('install', allinstall)
bininstalltarget = env.Alias('install-bin', blenderinstall)
Property changes on: branches/soc-2011-cucumber/build_files
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/build_files:41227-45910
/trunk/blender/source/darwin/build_files:41227-41228
+ /trunk/blender/build_files:41227-45967
/trunk/blender/source/darwin/build_files:41227-41228
Copied: branches/soc-2011-cucumber/build_files/scons/config/win64-mingw-config.py (from rev 45967, trunk/blender/build_files/scons/config/win64-mingw-config.py)
===================================================================
--- branches/soc-2011-cucumber/build_files/scons/config/win64-mingw-config.py (rev 0)
+++ branches/soc-2011-cucumber/build_files/scons/config/win64-mingw-config.py 2012-04-26 03:11:15 UTC (rev 45969)
@@ -0,0 +1,207 @@
+LCGDIR = '#../lib/mingw64'
+LIBDIR = "${LCGDIR}"
+
+BF_PYTHON = LIBDIR + '/python'
+BF_PYTHON_VERSION = '3.2'
+WITH_BF_STATICPYTHON = False
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = 'python'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
+BF_PYTHON_DLL = 'python32'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+
+WITH_BF_OPENAL = True
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+
+WITH_BF_FFMPEG = False # TODO: FFmpeg gives linking errors, need to compile with MinGW-w64?
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
+BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include'
+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'
+
+WITH_BF_JACK = False
+BF_JACK = LIBDIR + '/jack'
+BF_JACK_INC = '${BF_JACK}/include'
+BF_JACK_LIB = 'libjack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile-1'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+BF_PTHREADS = '' # Part of MinGW-w64
+BF_PTHREADS_INC = ''
+BF_PTHREADS_LIB = ''
+BF_PTHREADS_LIBPATH = ''
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = LIBDIR + '/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Imath IlmThread Iex'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = LIBDIR + '/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/png'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+WITH_BF_TIFF = True
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = LIBDIR + '/zlib'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_OPENJPEG = True
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_OCEANSIM = True
+WITH_BF_PLAYER = True
+WITH_BF_LIBMV = True
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_WINTAB = LIBDIR + '/wintab'
+BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LIBDIR + '/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2/'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_REDCODE = False
+BF_REDCODE_INC = '#extern'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = 'C:\\MingW'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB = 'opengl32 glu32'
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
+ '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+ '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+
+WITH_BF_COLLADA = False # TODO: Compile Collada with MinGW-w64
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+
+BF_OPENCOLLADA = LIBDIR + '/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+
+#Cycles
+WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = False
+BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = LIBDIR + '/boost'
+BF_BOOST_INC = BF_BOOST + '/include'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list