Merged changes in the trunk up to revision 29409.
[blender.git] / source / creator / CMakeLists.txt
index 1b01676a2b187e25b10f878a180b68dc21dd87c2..af3a05adadabe12a5c15ba280db06110507bf82c 100644 (file)
@@ -29,17 +29,13 @@ CMAKE_POLICY(SET CMP0005 NEW)
 
 SETUP_LIBDIRS()
 
-INCLUDE_DIRECTORIES(../../intern/guardedalloc
+INCLUDE_DIRECTORIES(
+       ../../intern/guardedalloc
        ../blender/blenlib
        ../blender/blenkernel
        ../blender/editors/include
        ../blender/makesrna
-       ../blender/makesrna/intern
-       ../blender/nodes
-       ../blender/include
-       ../blender/blenloader
        ../blender/imbuf
-       ../blender/renderconverter
        ../blender/render/extern/include
        ../blender/makesdna
        ../blender/gpu
@@ -47,7 +43,6 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc
        ../blender/windowmanager
        ../kernel/gen_messaging
        ../kernel/gen_system
-       ../../extern/glew/include
 )
 
 IF(WIN32)
@@ -346,7 +341,7 @@ ADD_DEPENDENCIES(blender makesdna)
 
 FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_editors blender_render)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager blender_render)
 
 IF(WITH_ELBEEM)
        SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
@@ -360,7 +355,45 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
        # Sort libraries
        SET(BLENDER_SORTED_LIBS
                bf_windowmanager
-               bf_editors
+
+        bf_editor_space_api
+        bf_editor_space_action
+        bf_editor_space_buttons
+        bf_editor_space_console
+        bf_editor_space_file
+        bf_editor_space_graph
+        bf_editor_space_image
+        bf_editor_space_info
+        bf_editor_space_logic
+        bf_editor_space_nla
+        bf_editor_space_node
+        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
+
+        bf_editor_text
+        bf_editor_transform
+        bf_editor_util
+        bf_editor_uvedit
+        bf_editor_curve
+        bf_editor_armature
+        bf_editor_gpencil
+        bf_editor_interface
+        bf_editor_mesh
+        bf_editor_metaball
+        bf_editor_object
+        bf_editor_physics
+        bf_editor_render
+        bf_editor_screen
+        bf_editor_sculpt_paint
+        bf_editor_sound
+        bf_editor_animation
+        bf_editor_datafiles
+
                bf_freestyle
                blender_BSP 
                bf_ghost 
@@ -431,6 +464,7 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
                bf_blenfont
                bf_audaspace
                bf_decimation
+
        )
 
        IF(WITH_CXX_GUARDEDALLOC)