Brecht Van Lommel
d18d37d25f
Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-06-28 15:00:42 +00:00
Brecht Van Lommel
a05b66defb
CMake: set default cmake build type to Release. Without that you would
...
get a build that has neither debug symbols nor optimization, now it
will build an optimized blender by default.
2011-06-28 14:42:11 +00:00
Campbell Barton
c0a83d24e9
cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for debug
2011-06-28 02:49:49 +00:00
Mike Erwin
30b4ff8949
first attempt at CMake fix (untested)
2011-06-27 23:24:24 +00:00
Campbell Barton
e4f7b24e20
disable opencollada and openexr for msvc2010, gives linking errors
2011-06-27 16:33:59 +00:00
Campbell Barton
a961d62653
initialize cmake's CMAKE_BUILD_TYPE to 'Release'
...
add reference to cmake cache for convenience GNUMakefile
2011-06-27 13:18:08 +00:00
Campbell Barton
4b1cceddbd
fix for building with msvc/cmake take 2 (think its correct this time)
...
also sync build flags with scons.
2011-06-26 17:18:37 +00:00
Mitchell Stokes
3de7a67562
This solves the issue of having symlinks in the LIBDIR path (CMAKE Windows). Hopefully it doesn't break other things.
2011-06-26 08:42:00 +00:00
Campbell Barton
83000d8504
Allow the lib dir to be a symlink, pointed out by Mitchell Stokes.
2011-06-26 06:05:56 +00:00
Nathan Letwory
e7c6b535b0
Remove unnecessary check. OpenAL, SDL, JACK don't depend on samplerate.
2011-06-23 17:29:18 +00:00
Campbell Barton
0767779387
fix for building mingw in debug mode
2011-06-23 16:33:59 +00:00
Campbell Barton
99253abef8
allow building with ffmpeg but not aud
2011-06-23 16:10:48 +00:00
Campbell Barton
bb3742fe91
correction to recent commit & made ffmpeg includes only add when enabled.
2011-06-23 15:58:41 +00:00
Campbell Barton
c3e48219e6
mistake in own commit.
2011-06-23 15:12:05 +00:00
Campbell Barton
2023db70a8
cmake option to build without an audio library.
2011-06-23 09:27:56 +00:00
Brecht Van Lommel
07dee0d8a6
Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk
2011-06-21 15:47:18 +00:00
Campbell Barton
b1b8284f9b
fix for python include in msvc
2011-06-19 15:55:49 +00:00
Campbell Barton
c6eaa2300a
cmake: add find jack module
2011-06-19 15:03:50 +00:00
Campbell Barton
a8d4c1f8a9
cmake: add find jemalloc module
2011-06-19 14:55:51 +00:00
Campbell Barton
56c0f69071
fix for building opencollada + msvc
2011-06-19 14:14:29 +00:00
Campbell Barton
29977893d3
since cmake new auto-detects many features, print a summery of the configuration on first run.
2011-06-19 13:49:20 +00:00
Campbell Barton
6790dbe9db
cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.
2011-06-19 13:06:21 +00:00
Campbell Barton
77698421b3
fix for building with msvc
2011-06-19 10:19:10 +00:00
Campbell Barton
def6bcd4e5
cmake add module for finding fftw3.
...
also allow debug blender to build with non debug python
2011-06-19 08:57:34 +00:00
Campbell Barton
167bcc2b67
cmake: add libsamplerate find module
2011-06-19 08:20:02 +00:00
Campbell Barton
b15a2b0ffc
cmake: added FindOpenJPEG module.
2011-06-19 07:46:24 +00:00
Campbell Barton
145944d66f
cmake:
...
new macro file_list_suffix() for adding a suffix to every file in a path before the file extension.
useful to create names for debug libs on windows.
2011-06-19 06:57:56 +00:00
Campbell Barton
2c68bdb03e
cmake: make python search into a find package module.
2011-06-18 15:53:47 +00:00
Campbell Barton
968b2a8afb
rename cmake include/libraries to conform with suggested cmake names
2011-06-18 14:12:54 +00:00
Campbell Barton
549c2c58a1
added FindSndFile cmake module to replace inline checks.
2011-06-18 12:12:19 +00:00
Campbell Barton
1356082063
fix [ #27681 ] Python: crash assigning a 'set' to an array
2011-06-17 02:22:38 +00:00
Campbell Barton
c02121b708
use full library paths for openexr & msvc, also remove unneeded exr includes
2011-06-15 13:54:57 +00:00
Campbell Barton
4f3936083a
replace own inline cmake include search logic for a typical FindXXX.cmake module.
2011-06-15 12:09:02 +00:00
Campbell Barton
1243992f27
cmake: correct uninitialized vars
2011-06-14 00:24:50 +00:00
Brecht Van Lommel
c5e63925db
Cycles: svn merge -r37040:37333 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-06-09 14:53:25 +00:00
Campbell Barton
9dd066eb65
cmake: remove python include in the wm module, set opengl as a system include.
2011-06-08 05:39:58 +00:00
Campbell Barton
42ece56e91
don't write file history in backgound mode (running ctest would overwrite all my recent-files.txt), and add an error about mingw/quicktime being unsupported.
2011-06-08 01:53:12 +00:00
Campbell Barton
4a59928484
CMake option 'WITH_HEADLESS' to build blender in headless mode (no x11/xlib) with NULL ghost classe.
2011-06-04 14:12:55 +00:00
Brecht Van Lommel
6a128eee7b
Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-31 09:51:46 +00:00
M.G. Kishalmi
9b5800bcd7
fixed "rather then" -> "rather than" typos all over the place
2011-05-28 13:11:24 +00:00
Campbell Barton
2ccdcca7f5
fix for option WITH_CXX_GUARDEDALLOC with msvc
2011-05-24 06:44:39 +00:00
Campbell Barton
b69c1e8f1a
CMake changes
...
- don't allow building if the LIBDIR is not found on mac/windows.
- by default use -O2 rather then -O3 for GCC release flags, was crashing some GCC versions and blender releases are supposed to use -O2.
2011-05-23 14:56:14 +00:00
Brecht Van Lommel
88d9d89c97
Cycles: svn merge -r36495:36747 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-18 13:56:20 +00:00
Brecht Van Lommel
b434e7f933
LCMS code removed, was an experiment but never finished.
2011-05-16 13:34:42 +00:00
Campbell Barton
5cfc13a11d
fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__.
2011-05-16 10:34:40 +00:00
Campbell Barton
424a0cca27
option to link with jemalloc on *nix, off by default.
2011-05-12 11:16:32 +00:00
Campbell Barton
1e0c3d315b
minor cleanup, no functional changes.
2011-05-09 14:41:44 +00:00
Brecht Van Lommel
b25346a48c
Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-05 10:14:56 +00:00
Campbell Barton
07ee0dcc74
build system changes to eltopo, re-applied.
2011-05-02 03:44:02 +00:00
Joseph Eagar
088899236b
=trunk=
...
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.
To use, you need to install liblapack and libblas
2011-05-01 21:39:13 +00:00