diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /intern/ghost/CMakeLists.txt | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'intern/ghost/CMakeLists.txt')
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 6f30cecab61..dc55a81b0d8 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -152,7 +152,7 @@ elseif(APPLE AND NOT WITH_X11) intern/GHOST_WindowCocoa.h ) - if (NOT WITH_GL_EGL) + if(NOT WITH_GL_EGL) list(APPEND SRC intern/GHOST_ContextCGL.mm @@ -192,7 +192,7 @@ elseif(WITH_X11) intern/GHOST_WindowX11.h ) - if (NOT WITH_GL_EGL) + if(NOT WITH_GL_EGL) list(APPEND SRC intern/GHOST_ContextGLX.cpp @@ -272,7 +272,7 @@ elseif(WIN32) intern/GHOST_TaskbarWin32.h ) - if (NOT WITH_GL_EGL) + if(NOT WITH_GL_EGL) list(APPEND SRC intern/GHOST_ContextWGL.cpp @@ -280,6 +280,16 @@ elseif(WIN32) ) endif() + if(WITH_INPUT_IME) + add_definitions(-DWITH_INPUT_IME) + + list(APPEND SRC + intern/GHOST_ImeWin32.cpp + + intern/GHOST_ImeWin32.h + ) + endif() + if(WITH_INPUT_NDOF) list(APPEND SRC intern/GHOST_NDOFManagerWin32.cpp |