Sergey Sharybin
c2b9150db2
Disable legacy compositor by default
2012-09-14 15:21:56 +00:00
Lukas Toenne
f7a5569a97
OSL cmake cleanup:
...
* Removed unused lib and include directories (also one bad 'src' include that wouldn't work anyway)
* Copied cmake library finding to APPLE and WIN32 sections. These may need some adjustment for their respective OS.
2012-09-10 08:38:51 +00:00
Lukas Toenne
1352a955ca
Cleanup for OSL linking in cmake: Move cmake OSL library search and path definition from the cycles macro file to the top-level CMakeLists.txt. This makes the OSL_LIBRARIES and other variables accessible throughout Blender cmake scripts and especially in the creator module for linking libraries.
2012-09-10 06:18:20 +00:00
Antony Riakiotakis
3793e178f4
Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well.
...
This should make MinGW64 builds quite stable again :)
2012-08-22 00:06:09 +00:00
Campbell Barton
455c37c16b
option to build without the legacy compositor
2012-08-19 22:19:19 +00:00
Campbell Barton
47e313ec0c
cmake option to build without iksolver
2012-08-18 13:36:29 +00:00
Thomas Dinges
b174610a84
Cmake / Windows:
...
* Fix for Boost lib dir when using msvc 2010.
2012-08-14 19:13:47 +00:00
Thomas Dinges
211d30ea7f
Cmake / Windows:
...
* Fix for Python include path when using msvc 2010.
2012-08-14 16:53:40 +00:00
Thomas Dinges
6e939eb2ec
Cycles / Cmake:
...
* When CUDA building is enabled, build sm_30 kernel as well.
2012-08-09 12:08:35 +00:00
Jens Verwiebe
17fdc45437
OSX/cmake: refactoring of setting endianess defines, this fixes compile of builds with endianess other than the buildmachine and avoids also failing configuration with xcode 4.4 due not supporting big_endian archs anymore
2012-08-07 13:51:19 +00:00
Jens Verwiebe
9ee3a8655f
Fix for fix, now nested
2012-08-07 12:09:48 +00:00
Jens Verwiebe
d4029de0d6
Fix for endiantest, xcode condition interferred with other os
2012-08-07 12:03:43 +00:00
Jens Verwiebe
b9c441536c
OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management
2012-08-07 10:02:34 +00:00
Thomas Dinges
ab1badf9a2
Windows MSVC libraries:
...
* Some refactor, use set_lib_path macro again, which simplifies the code a bit.
2012-08-04 20:25:04 +00:00
Thomas Dinges
e0234cc821
Cmake / Windows Libraries:
...
* Some more fixes for OpenEXR, works now (tested with cv2008 x64 and x32)
* Some more changes to have libs in lib/win*/libname/vc2010 folder. Commit to libs itself to change that will follow.
2012-08-04 12:43:45 +00:00
Thomas Dinges
f50bae3259
Revert part of r49504 by Genscher:
...
* MSVC Paths were put into the MinGW block, so Mingw did not work anymore.
* Also fix paths for vc2010 libs now, so they should work now with cmake.
2012-08-04 11:39:16 +00:00
Sergey Sharybin
1a5998bc4e
Remove old boolean operation module
...
Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.
Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.
Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.
2012-08-02 16:42:30 +00:00
Daniel Genrich
dc67840db6
OpenEXR: Enable again for MSVC 2010
2012-08-02 14:21:25 +00:00
Antony Riakiotakis
fa92f2fb55
Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.
2012-07-05 11:39:11 +00:00
Thomas Dinges
6829f613c2
Cmake / Boost:
...
* Code cleanup
2012-07-04 16:39:34 +00:00
Alexander Pinzon
04343ecd8c
Windows (msvc 2010) is now using Boost 1.49 - Updated cmake file.
2012-07-04 16:10:22 +00:00
Campbell Barton
7d223a1d14
don't disable cycles when OIIO isnt found, instead throw an error, annoying when full build is done and later find cycles isn't on.
2012-07-01 15:26:25 +00:00
Thomas Dinges
786e4a1014
Cycles / Boost:
...
* Windows (msvc 2008) is now using Boost 1.49 - Updated cmake file.
2012-06-30 18:24:28 +00:00
Campbell Barton
90dc1d1353
the compositor optional for cmake: WITH_COMPOSITOR
2012-06-30 14:14:22 +00:00
Campbell Barton
25f59c8e0b
code cleanup: cmake buildsystem edits, unused var warnings and better description for WITH_PYTHON_MODULE.
...
also disable workaround for some linux installs.
2012-06-28 08:51:02 +00:00
Campbell Barton
3c8a4c458b
more guardedalloc use in C++, also make compositorMutex a static var, was allocated and never freed.
2012-06-25 10:35:24 +00:00
Campbell Barton
0c8ebad16e
add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.
2012-06-23 14:23:44 +00:00
Campbell Barton
263be14811
rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.
2012-06-23 13:42:14 +00:00
Antony Riakiotakis
df0bc84439
Set openjpeg to static. Solves linking issues on recent openjpeg update
2012-06-21 14:44:15 +00:00
Campbell Barton
5248ec57d9
minor fixes
...
- new compositor could use uninitialized var
- profile conversion could use uninitialized var
- set better warnings for clang+cmake.
- remove picky warnings from sphinx doc gen shell script.
2012-06-11 12:13:41 +00:00
Thomas Dinges
0415913740
Cmake:
...
* Removed first line, probably accidentally committed in r47439.
2012-06-06 21:55:55 +00:00
Campbell Barton
06556a92e5
correction to own change with cmake, oiio linking.
2012-06-05 06:18:31 +00:00
Campbell Barton
f94123a5c6
only use tiff/exr when enabled.
2012-06-04 22:34:28 +00:00
Thomas Dinges
2230f3346e
Cycles / OSL:
...
* Compile option to build with OSL, disabled by default.
2012-06-04 16:30:15 +00:00
Antony Riakiotakis
492c28f7ff
reenable sm13 for win32 cmake
2012-05-29 16:18:10 +00:00
Sergey Sharybin
1a8d7f4fc1
Patch #31563 : Additional include directory for FFMPEG
...
Fedora 16 is still using /usr/include/ffmpeg, not /usr/include to store FFmpeg's
headers. Added it to search paths.
Also remove FFmpeg include directory listed in FFMPEG_INCLUDE_DIRS twice
Patch by Arno Mayrhofer (aka azrael3000), thanks!
2012-05-27 13:44:21 +00:00
Campbell Barton
1e45042396
code cleanup: remove mode comments, these were applied very un-evenly across a few files.
2012-05-27 13:22:43 +00:00
Campbell Barton
9978f97b12
cmake edits
...
- only show mingw option when building with mingw
- always run cmake configure with convenience build targets so failed configurations stop re-configuring.
- disable WITH_GHOST_XDND in 'make lite'
2012-05-27 10:03:13 +00:00
Brecht Van Lommel
942fcf4415
Unix: enable use of XDG paths for storing Blender configuration on Linux/BSD/..,
...
starting from version 2.64. Unless you have a special system setup, this means the
will be in ~/.config/blender rather than ~/.blender.
When the version number is changed to 2.64, the "Copy Previous Settings" operator
in the splash will copy the settings to the new location.
XDG base directory specification:
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
2012-05-25 12:08:29 +00:00
Antony Riakiotakis
1937f3b8de
Disable building of CUDA 1.3 kernels for cycles for win32 cmake and mingw32 scons. They were already disabled for scons MSVC 32bit.
2012-05-22 12:30:37 +00:00
Campbell Barton
ed679693c9
style cleanup: whitespace/indentation
2012-05-19 13:55:54 +00:00
Campbell Barton
69dc5d094a
attempt to fix osx build error
2012-05-17 14:00:54 +00:00
Antony Riakiotakis
63eb324bcb
Fix own mistake: Open Collada libs are different for MinGW/MinGW64
2012-05-17 08:42:22 +00:00
Daniel Genrich
1f49f335a9
Fix compile error with cmake + windows (reported by MiikaH)
2012-05-16 12:18:25 +00:00
Daniel Genrich
7f92b5f79a
Fix El Topo:
...
- Library compile errors
- 2 Bugs (have been reported to lib owner)
- LAPACK for cmake
TODO:
- Scons is still missing LAPACK lib define
- Do other platforms got LAPACK lib?
2012-05-15 11:35:01 +00:00
Antony Riakiotakis
232980eef0
Cleanup optimization compile flags for mingw-w64.
...
After testing it seems that for safe debug sessions, debug build optimizations need to be off.
Also removed sse flags from release flags since they are included in ray optimization flags which are on by default.
2012-05-14 23:36:07 +00:00
Antony Riakiotakis
a55e97058b
Add support for opencollada for MinGW64 and cmake
2012-05-13 13:32:48 +00:00
Antony Riakiotakis
f91fa9d2ce
Enable ffmpeg building with MinGW-w64. The libraries were compiled with gcc 4.7, however is has been claimed there are issues with gcc > 4.4 so this is for testing purposes. Still it doesn't crash on startup anymore. Forgot to mention on ffmpeg lib commit that committed ffmpeg version is 0.10.2
2012-05-10 11:37:41 +00:00
Campbell Barton
299ff91ea1
code cleanup: BKE_scene api naming.
...
also stop numpy from being found in /usr/include with cmake.
2012-05-05 14:33:36 +00:00
Campbell Barton
7f8643806d
cmake - improved detection of numpy, now works for typical ubuntu installation.
...
numpy directory can be referenced manually with the advanced option PYTHON_NUMPY_PATH if needed.
2012-05-01 23:22:58 +00:00