| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
optimization option in cmake
OpenCollada new version (721) lib has additional lib files to link with.
Added BF_RAY_OPTIMIZATION option in CMake (as the one in scons) for building SIMD optimized ray tracing code.
|
|
scons+vc build crashes on Blender start when BF_COLLADA is on, don't know why this happens.
Merging from trunk to get working vc project files, then will try to debug and locate the problem.
|
|
OpenCollada at revision 721. Thanks Sergey!
People who want to build this branch will need update their OpenCollada.
On Linux OpenCollada builds without patching. As usual I updated the build doc: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch#Building_the_COLLADA_GSoC_branch
A small change will be necessary in cmake and scons options on Mac and Windows: OpenCollada's libBuffer was renamed to libbuffer.
|
|
* Added -Wno-unknown-pragmas to the cflags, silences warnings when OpenMP is diabled.
|
|
|
|
only work on other unixes that way
|
|
and <libraryname>.lib in release builds
this prevents crashing at startup of Blender in debug builds with cmake.
See bugreport by Andrea in the mailinglist here:
http://www.mail-archive.com/bf-committers@blender.org/msg00668.html
Also enabled WITH_OPENCOLLADA in cmake by default so the feature gets tested. If other devs like to keep OpenCollada it disabled, please revert the ON to OFF again.
|
|
|
|
|
|
OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
|
|
|
|
release mode
Quicktime/Qtkit linkflags fix for i386 platform
|
|
flags from non-apple Unix configuration.
|
|
|
|
code and /usr/include, its only used in our netscape plugin.
- CMake on unix default OpenMP to enabled.
- Scons on linux default OpenMP to enabled.
- copying python is slow, for scons only copy if the directory has not been created.
|
|
This makes quicktime import (.mov & quicktime handled image files such as .gif) available also for 64bit OSX
Unfortunately, Apple currently incomplete implementation of QTKit has much lower performance than old Carbon Quicktime.
FYI, it spawns a 32bit process "QTKitserver" to place calls to Quicktime 7.
So this is mostly meant as a "backup" for 64bit OSX builds, until Apple releases full Quicktime X.
Export part will come just after.
CMake scripts updated: set WITH_QUICKTIME and USE_QTKIT to ON
|
|
OpenCollada @ 675.
To build OpenCollada:
* apply this patch http://wiki.blender.org/index.php/File:Opencollada@675.diff
* build by typing 'scons XMLPARSER=expatnative' (pcre and expat must be installed)
* after build, copy all compiled libs into 'lib' (Blender build will refer to it):
rm -rd lib
mkdir lib
find . -iname '*.a' | xargs cp -t lib
|
|
|
|
Add support for OPTION WITH_OPENCOLLADA for Windows
|
|
|
|
- add optimize flags setting in CMake for release builds
|
|
- remove CMake warnings when building with openMP
|
|
into trunk).
|
|
|
|
- Updated CMake files for building with openCollada
Update of the 10.5 libs including openCollada is coming in next commit
|
|
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
|
|
|
|
|
|
Re-enabled collada code building by default in cmake. Realized this should be off only in trunk.
|
|
Resolved the 'inconsistent newlines' merge error by updating my svn client.
The error was caused by a bug in svn client (http://subversion.tigris.org/issues/show_bug.cgi?id=3262) that was
fixed in 1.5.5.
Fixed conflicts in image.c, object_edit.c, wm_operators.c, source/creator/CMakeLists.txt and CMakeLists.txt.
Merge didn't remove some files that were moved/renamed in trunk, svn reported 'Skipped [filename]' on these files.
I removed them with:
svn --force remove release/io
svn --force remove release/ui
svn --force remove source/blender/editors/preview
svn --force remove source/blender/editors/physics/ed_fluidsim.c
svn --force remove source/blender/editors/physics/editparticle.c
svn --force remove source/blender/editors/physics/ed_pointcache.c
svn --force remove source/blender/editors/mesh/mesh_layers.c
Now, before merging into trunk, need to update collada code so it builds ok and fix the possibility to build without
collada.
|
|
patch by Guillaume, thanks!
|
|
|
|
blender on mac)
The WITH_LIBS10.5 option switches the use of the libs included in the darwin-9.x.universal folder
Use the CMAKE_OSX_ARCHITECTURES variable to set the architecture you want to build for (e.g. i386, x86_64). Only one at a time, this value is used to select the python_?.zip that is bundled with the app.
WITH_COCOA (build Cocoa ghost and not Carbon) is now on by default.
|
|
|
|
GHOST*Cocoa.mm & .h files creation
First Cocoa version of GHOST_SystemCocoa.mm
CMake files update to allow optional (WITH_COCOA option) Cocoa version build - disabled by default
SCons files are not updated to allow Cocoa build (the ghost .mm files)
|
|
pointcache.c also needed to have checks for these defines.
|
|
|
|
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/Unix_FHS
for scons WITH_BF_FHS enabled an alternative layout eg.
scons WITH_BF_FHS=1 BF_INSTALLDIR="/usr/local"
for CMake just run "make install" after make (CMAKE_INSTALL_PREFIX is used for the base path)
Currently only scripts use both the system and user path correctly, other areas of blender have their own path code inline with lots of ifdefs, needs to be carefully updated.
|
|
to tell the system to make the location of libpcre and libexpat
a settable option though -- maybe somebody who is more of an
expert can look at this.
|
|
|
|
Was annoying to use a different editor for cmake only.
theeth says this should be ok with gsoc and merges from branches.
|
|
* first working changes to get blenderplayer linking
* blenderplayer/ moved into source/ (CMakeLists.txt changed for that too)
* added externs for bprogname to gp_ghost, so that it links properly
|
|
|
|
* Updated UserDef RNA so that only compiled in audio drivers are displayed. (Missing definitions in Makefiles, someone fix please!)
* Fixed libsndfile and ffmpeg building with CMake with msvc.
|
|
|
|
from Guillaume Lecocq (lguillaume)
[#19247] (2.5) useless WITH_OPENEXR redefinition
from Mauro Toffanin (equilibrium)
|
|
we want to remove it can be re-enabled.
fix view3d python errors with no object/edit object.
|
