15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
460cde345b
svn merge ^/trunk/blender -r40394:40395
2011-09-23 10:43:25 +00:00
226e424cb2
svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-11 04:53:57 +00:00
Xiao Xiangquan
465c3b82fa
merge with trunk r39216
2011-08-10 14:32:03 +00:00
3a55da7616
removed old ndof transform code, to be replaced with modern stuff in 2.6
2011-08-07 17:01:44 +00:00
Xiao Xiangquan
287b24926f
merge with trunk r38787
2011-07-29 17:42:53 +00:00
fc95382a97
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:55:23 +00:00
5792bd7cc7
cmake: cleanup include paths, some duplicates and going up some unneeded dirs.
2011-07-17 09:11:13 +00:00
Xiao Xiangquan
40981d872f
merge from trunk r37405
2011-06-15 08:28:56 +00:00
8949387186
svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 05:28:00 +00:00
09da9d4393
cmake maintenance
...
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
c98148a963
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
5c7bed92d4
fix for cmake glew includes (tested with mingw), also made qtcreator project generator work with mingw again
2011-04-06 03:02:40 +00:00
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
Nathan Letwory
322ff7dfe4
I swear, it was just an innocence change in guardedalloc!
...
The butterfly wing flap, causing a nice storm in the rest of blender.
Now all dependencies should point ok again. CMakers, do double-test.
2011-02-21 12:35:04 +00:00
5e382eb8e5
rename blenderlib to blender_add_lib
2010-12-22 23:09:30 +00:00
afacd18498
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
2010-12-08 08:43:06 +00:00
e8397e6193
include headers in cmake source, added a script to check for consistency, reporting missing headers & C files.
...
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
2010-11-29 04:35:56 +00:00
c6976e7351
use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
...
globbing vs explicit is discussed here.
http://www.cmake.org/pipermail/cmake/2008-December/025694.html
Practical implications are:
- developers need to keep CMakeLists.txt files up to date.
- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
2010-10-23 04:05:55 +00:00
dea59cc5eb
warning fixes and minor cmake changes.
2010-09-18 03:55:56 +00:00
c11c196efa
part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
2010-07-19 04:44:37 +00:00
2ebb1c63f7
finish cleanup to cmake editors, also removed some stuff from scons thats not needed.
2010-06-05 23:27:49 +00:00
129bee4743
remove cruft from cmake files, more to go
2010-06-04 20:56:56 +00:00
55d3a2014c
have cmake build editors as different libs like scons and nan-makefiles
2010-06-04 11:34:57 +00:00
