Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2010-04-03OSX: CMake & scons update for Ogg/Vorbis/FLAC added support to lib SNDFILEDamien Plisson
Note that you need to svn up the precompiled lib folder (darwin-*) too to be able to build with SNDFILE
2010-04-02would not want to wait for 'that' on every buildJens Ole Wund
MS scons win32 skip calling makebsc by default
2010-03-12confirmed with multiple people that Collada builds fine with mingw win32 on ↵Tom Musgrove
scons. So setting it back to true by default.
2010-03-12Bug #20410: collada doesn't compile with mingw but is enabled by default. SinceBrecht Van Lommel
no one seems to be fixing this I've just disabled it by default now.
2010-02-23Win64: Bugfix for non working scons, thanks to matd for the fix!Daniel Genrich
jesterKing: please check if the win32 dll's aren't needed anymore. Seems that they are compiled into ffmpeg, right?
2010-02-23Win64: Bugfix for missing include, reported + fixed by matd, thanksDaniel Genrich
2010-02-22OSX buildscripts update following ffmpeg precompiled libs updateDamien Plisson
2010-02-18Scons fixes:Joerg Mueller
- Removing alut - Minor changes in linux ffmpeg default config.
2010-02-15OSX/Scons cleanup : remove option to build with extern/ffmpeg and old python ↵Damien Plisson
2.5 options
2010-02-14== FFMPEG ==Peter Schlaile
Made using system's ffmpeg the default now. (First step in removing ffmpeg from extern)
2010-02-11scons linux config: only BF_OPENCOLLADA needs to be user-set, ↵Arystanbek Dyussenov
BF_OPENCOLLADA_INC is derived.
2010-02-10OSX/scons : fine tune Intel archs optimization flagsDamien Plisson
2010-02-01this restores building on mingw with Collada support, also it restores cross ↵Tom Musgrove
compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit
2010-02-01OSX : fix OpenCollada build for 10.4 targets with sconsDamien Plisson
2010-01-31changes to get MingW compiling and cross compiling working, patch by Sergey ↵Tom Musgrove
Sharybin
2010-01-30OSX : update build scripts for updated openCollada libs + ray tracing ↵Damien Plisson
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.
2010-01-30Merge -c 26209,26214,26443 from COLLADA branch into trunk.Arystanbek Dyussenov
2010-01-30COLLADA branch: updated vc9 project files and w32 scons config.Arystanbek Dyussenov
2010-01-30COLLADA branch: merge from trunk -r 25745:26429.Arystanbek Dyussenov
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.
2010-01-23COLLADA branch: patch for importer from Sergey I. Sharybin to build against ↵Arystanbek Dyussenov
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.
2010-01-20set to python 3.1 in scons config.Campbell Barton
2010-01-19patch [#20612] Making Blender compile on AIX 4.3.3Campbell Barton
from Philipp Gühring (sourcerer)
2010-01-18OSX/scons : fix cross-build issue during linking phase with dynlibsDamien Plisson
2010-01-05Merge from trunk -r 25003:25745.Arystanbek Dyussenov
2009-12-23OSX / Scons : set MACOSX_DEPLOYMENT_TARGET env var to allow builds for older ↵Damien Plisson
systems
2009-12-10* WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd.Nathan Letwory
This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage what SSE flags are best for the platform built for. Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only.
2009-12-05* enabled COLLADA for mingw. (Compiles at least with MingW GCC 3.4.2).Nathan Letwory
2009-12-02Mac: Following 10.4 ppc libs availability, update cmake & scons default settingsDamien Plisson
2009-12-02Apply patch [#20145] Ghost Win32 roundup patch: Minimum Window Size, ↵Nathan Letwory
Continuous Grab and Drag And Drop This nice patch by Matt D. (matd in #blendercoders) adds three nice features that can be seen already in the other supported OSes: * minimum window size: to prevent some bugs with the window manager of Blender, system windows cannot be resized smaller than the minimum size. * Continuous Grab is finally in Windows! Default settings since alpha 0 already have the feature enabled by default, so grab a new build and enjoy :) * GHOST support for drag and drop added. This prepares Blender for drag and drop from OS -> Blender. Currently not very useful, since wm needs to be readied for that. But it does work (do BF_GHOST_DEBUG=1 build and drag a file onto a Blender window). Thanks Matt D.!
2009-12-01Mac scons config: enable cross-compile, set 10.4 as default for ppc (using ↵Damien Plisson
darwin-8.0.0-powerpc libs), set opencollada not to be built by default
2009-11-29Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for ↵Arystanbek Dyussenov
OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
2009-11-22COLLADA branch: merge from trunk -r 24522:24758.Arystanbek Dyussenov
2009-11-19- remove CPPFLAG XP_UNIX from CMake, Scons and Irix make, checked our own ↵Campbell Barton
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.
2009-11-18scons update to enable build with QTKit (Cocoa Quicktime)Damien Plisson
Thx Jens Verwiebe for the patch
2009-11-15COLLADA: updated cmake and scons settings (on linux) to build against ↵Arystanbek Dyussenov
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
2009-11-14- scons fix for 10.4 build (use the 10.4 libs dir)Damien Plisson
- warning fix in ghost/cocoa
2009-11-12COLLADA: merge from trunk -r 24390:24522.Arystanbek Dyussenov
2009-11-09Mac :Damien Plisson
- scons update to build with openCollada - scons & cmake update for render optimization cflags
2009-11-07Merge from trunk -r 24247:24313, -r 24313:24390.Arystanbek Dyussenov
2009-11-03== COLLADA ==Nathan Letwory
* fix win64 build and add proper library usage for COLLADA 64bit. Update also lib/win64 (r24263).
2009-11-02Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch ↵Arystanbek Dyussenov
into trunk).
2009-11-02Merge from trunk -r 23968:24181.Arystanbek Dyussenov
2009-11-02== COLLADA ==Nathan Letwory
* proper library names and order. Goes together with 76MB commit for r24225
2009-10-30Make Collada False by default everywhereMartin Poirier
2009-10-30Mac / COCOA : Damien Plisson
- fix 10.4 compile issues - fix some scons issues & add WITH_BF_COLLADA = False in scons darwin_config.py to allow build waiting for complete Collada Mac implementation
2009-10-30Merge of the COLLADA GSoC branch into trunk.Arystanbek Dyussenov
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
2009-10-27Mac:Damien Plisson
Fixed gcc-4.0 compile error (cocoa) Updated scons to build cocoa (32bit & 64bit) (Thx Jens Verwiebe for the patch): - make sure right python is unzipped to app-bundle ( printing information at the end of compiling ) - make sure arch-setting appends needed flags ( depending on OSX-version obsolete sometimes but harmless ) - link correct frameworks depending on gfx-api ( cocoa/carbon) - conscript prepared for cocoa objC-files - link to openAL-framework, using the headers from blender-lib + the symbols in framework Usage instruction: The default build is Cocoa 32bit. To change it, copy config/darwin-config.py to user-config.py in the blender folder, and edit: - WITH_GHOST_COCOA & MACOSX_ARCHITECTURE variables to select cocoa/carbon, and the arch (i386, X86_64, ppc, ..) - the libs options as usual
2009-10-25Merge from trunk -r 23000:23968.Arystanbek Dyussenov
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.
2009-10-19Merge from trunk -r 22040:23000.Arystanbek Dyussenov
2009-10-05* Unzip python bundle at the end of the build process. Patch by b333rt, thanks!Nathan Letwory
* remove /ARCH setting - is used only when building x86