Merge branch 'master' into blender2.8
[blender.git] / source / blender / windowmanager / CMakeLists.txt
index 810cceb5fc37cd99df13500ba90f7a2ef82b4eab..eb01332fc2669a287bc6bb25c20d9cdf470a94e1 100644 (file)
 
 set(INC
        .
+       manipulators
+       manipulators/intern
        ../blenfont
        ../blenkernel
        ../blenlib
        ../blenloader
        ../blentranslation
        ../compositor
+       ../depsgraph
        ../editors/include
+       ../draw
        ../gpu
        ../imbuf
        ../makesdna
        ../makesrna
        ../nodes
        ../render/extern/include
-       ../../gameengine/BlenderRoutines
        ../../../intern/clog
        ../../../intern/ghost
        ../../../intern/guardedalloc
@@ -71,12 +74,23 @@ set(SRC
        intern/wm_playanim.c
        intern/wm_stereo.c
        intern/wm_subwindow.c
+       intern/wm_toolsystem.c
        intern/wm_tooltip.c
        intern/wm_uilist_type.c
        intern/wm_window.c
+       manipulators/intern/wm_manipulator.c
+       manipulators/intern/wm_manipulator_group.c
+       manipulators/intern/wm_manipulator_group_type.c
+       manipulators/intern/wm_manipulator_map.c
+       manipulators/intern/wm_manipulator_target_props.c
+       manipulators/intern/wm_manipulator_type.c
+       message_bus/intern/wm_message_bus.c
+       message_bus/intern/wm_message_bus_rna.c
+       message_bus/intern/wm_message_bus_static.c
 
        WM_api.h
        WM_keymap.h
+       WM_toolsystem.h
        WM_types.h
        wm.h
        wm_cursors.h
@@ -84,12 +98,18 @@ set(SRC
        wm_event_system.h
        wm_event_types.h
        wm_files.h
-       wm_subwindow.h
        wm_window.h
+       manipulators/WM_manipulator_api.h
+       manipulators/WM_manipulator_types.h
+       manipulators/wm_manipulator_fn.h
+       manipulators/wm_manipulator_wmapi.h
+       manipulators/intern/wm_manipulator_intern.h
+       message_bus/intern/wm_message_bus_intern.h
+       message_bus/wm_message_bus.h
 )
 
 if(WITH_AUDASPACE)
-       add_definitions(${AUDASPACE_DEFINITIONS})
+       add_definitions(-DWITH_AUDASPACE)
 
        list(APPEND INC_SYS
                ${AUDASPACE_C_INCLUDE_DIRS}
@@ -126,10 +146,6 @@ if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
 
-if(WITH_GAMEENGINE)
-       add_definitions(-DWITH_GAMEENGINE)
-endif()
-
 if(WITH_BUILDINFO)
        add_definitions(-DWITH_BUILDINFO)
 endif()