[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46364] branches/meshdata_transfer: svn merge ^/trunk/blender -r45927:46000
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Sun May 6 21:32:54 CEST 2012
Revision: 46364
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46364
Author: cyborgmuppet
Date: 2012-05-06 19:32:53 +0000 (Sun, 06 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r45927:46000
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45927
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/SConstruct
branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
branches/meshdata_transfer/build_files/scons/tools/btools.py
branches/meshdata_transfer/doc/manpage/blender.1
branches/meshdata_transfer/extern/bullet2/src/LinearMath/btSerializer.h
branches/meshdata_transfer/intern/audaspace/intern/AUD_Buffer.cpp
branches/meshdata_transfer/intern/cycles/blender/addon/ui.py
branches/meshdata_transfer/intern/elbeem/intern/ntl_geometrymodel.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/meshdata_transfer/intern/tools/credits_svn_gen.py
branches/meshdata_transfer/release/datafiles/splash.png
branches/meshdata_transfer/release/scripts/modules/blend_render_info.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
branches/meshdata_transfer/release/scripts/startup/keyingsets_builtins.py
branches/meshdata_transfer/release/windows/installer/00.sconsblender.nsi
branches/meshdata_transfer/source/blender/avi/intern/avi.c
branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_report.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_tessmesh.h
branches/meshdata_transfer/source/blender/blenkernel/intern/anim_sys.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/collision.c
branches/meshdata_transfer/source/blender/blenkernel/intern/customdata.c
branches/meshdata_transfer/source/blender/blenkernel/intern/idprop.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mball.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh_validate.c
branches/meshdata_transfer/source/blender/blenkernel/intern/packedFile.c
branches/meshdata_transfer/source/blender/blenkernel/intern/pointcache.c
branches/meshdata_transfer/source/blender/blenkernel/intern/text.c
branches/meshdata_transfer/source/blender/blenlib/BLI_array.h
branches/meshdata_transfer/source/blender/blenlib/intern/fileops.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/bmesh/bmesh.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_construct.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_core.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_marking.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_marking.h
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_inset.c
branches/meshdata_transfer/source/blender/bmesh/tools/BME_bevel.c
branches/meshdata_transfer/source/blender/editors/armature/poselib.c
branches/meshdata_transfer/source/blender/editors/datafiles/splash.png.c
branches/meshdata_transfer/source/blender/editors/datafiles/startup.blend.c
branches/meshdata_transfer/source/blender/editors/include/ED_keyframing.h
branches/meshdata_transfer/source/blender/editors/include/ED_mesh.h
branches/meshdata_transfer/source/blender/editors/include/ED_render.h
branches/meshdata_transfer/source/blender/editors/include/ED_uvedit.h
branches/meshdata_transfer/source/blender/editors/include/UI_interface.h
branches/meshdata_transfer/source/blender/editors/interface/interface_widgets.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_loopcut.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_rip.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_select.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_slide.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_utils.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_intern.h
branches/meshdata_transfer/source/blender/editors/object/object_group.c
branches/meshdata_transfer/source/blender/editors/render/render_update.c
branches/meshdata_transfer/source/blender/editors/screen/screen_edit.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_image.c
branches/meshdata_transfer/source/blender/editors/space_image/space_image.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_draw.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_edit.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_ops.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_select.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_tools.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_tree.c
branches/meshdata_transfer/source/blender/editors/space_text/text_python.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawmesh.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_edit.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_select.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_snap.c
branches/meshdata_transfer/source/blender/editors/transform/transform.c
branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
branches/meshdata_transfer/source/blender/editors/transform/transform_generics.c
branches/meshdata_transfer/source/blender/editors/transform/transform_manipulator.c
branches/meshdata_transfer/source/blender/editors/transform/transform_orientations.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_buttons.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_draw.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_ops.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/meshdata_transfer/source/blender/makesdna/DNA_modifier_types.h
branches/meshdata_transfer/source/blender/makesrna/intern/rna_curve.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_sequencer.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_jobs.c
branches/meshdata_transfer/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_GameObject.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/meshdata_transfer/source/tools/uncrustify_clean.sh
Removed Paths:
-------------
branches/meshdata_transfer/extern/bullet2/patches/
branches/meshdata_transfer/intern/audaspace/patches/
branches/meshdata_transfer/intern/elbeem/patches/
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
branches/meshdata_transfer/intern/tools/credits_svn_gen.py
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:44563-45927
+ /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
/trunk/blender:44563-46000
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-05-06 18:44:18 UTC (rev 46363)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-05-06 19:32:53 UTC (rev 46364)
@@ -802,34 +802,36 @@
endif()
if(MSVC)
- if(CMAKE_CL_64)
- set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
- else()
- set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
- endif()
+ set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
- set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/nologo /J /Gd" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /MT" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /MT" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi" CACHE STRING "MSVC MT flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /MT" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi" CACHE STRING "MSVC MT flags " FORCE)
+ # most msvc warnings are C & C++
+ set(_WARNINGS "/W3 /wd4018 /wd4244 /wd4305 /wd4800 /wd4181 /wd4065 /wd4267 /we4013")
+ set(C_WARNINGS "${_WARNINGS}")
+ set(CXX_WARNINGS "${_WARNINGS}")
+ unset(_WARNINGS)
+
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
@@ -1001,6 +1003,9 @@
set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
+ # used in many places so include globally, like OpenGL
+ blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
+
elseif(CMAKE_COMPILER_IS_GNUCC)
# keep GCC specific stuff here
set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
@@ -1008,10 +1013,8 @@
if(WITH_MINGW64)
#Yes, the point for MinGW64 is moar optimization by default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2")
- set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
@@ -1156,9 +1159,6 @@
endif()
- # used in many places so include globally, like OpenGL
- blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
-
elseif(APPLE)
if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} STRGREATER "10.5")
Modified: branches/meshdata_transfer/SConstruct
===================================================================
--- branches/meshdata_transfer/SConstruct 2012-05-06 18:44:18 UTC (rev 46363)
+++ branches/meshdata_transfer/SConstruct 2012-05-06 19:32:53 UTC (rev 46364)
@@ -774,7 +774,7 @@
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
- if env['WITH_BF_OIIO']:
+ if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
dllsources.append('#source/icons/blender.exe.manifest')
Modified: branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py 2012-05-06 18:44:18 UTC (rev 46363)
+++ branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py 2012-05-06 19:32:53 UTC (rev 46364)
@@ -1,207 +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'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list