diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
| commit | 121ff4223dbd5c42ecc4919d09ce464d01faf4e7 (patch) | |
| tree | 5102e8d4f18a142aaff07fc355d0fd0208ccf651 /source/creator | |
| parent | a96c3ce9e0a61bc29fef8212a742658795aabbed (diff) | |
| parent | 77c51607914b7fe4744437f6d47fedab628b444d (diff) | |
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c1fee1c1642..5f6b6255b68 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -751,6 +751,16 @@ if(WITH_MOD_FLUID) list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem) endif() +if(WITH_CYCLES) + list(APPEND BLENDER_LINK_LIBS + cycles_render + cycles_bvh + cycles_device + cycles_kernel + cycles_util + cycles_subd) +endif() + #if(UNIX) # Sort libraries set(BLENDER_SORTED_LIBS @@ -770,7 +780,6 @@ endif() bf_editor_space_outliner bf_editor_space_script bf_editor_space_sequencer - bf_editor_space_sound bf_editor_space_time bf_editor_space_userpref bf_editor_space_view3d @@ -833,7 +842,6 @@ endif() extern_minilzo extern_lzma extern_colamd - extern_libmv ge_logic_ketsji extern_recastnavigation ge_phys_common @@ -855,6 +863,13 @@ endif() bf_blenfont bf_intern_audaspace bf_intern_mikktspace + bf_intern_cycles + cycles_render + cycles_bvh + cycles_device + cycles_kernel + cycles_util + cycles_subd ) if(WITH_LIBMV) |