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/SConscript | |
| 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/SConscript')
| -rw-r--r-- | intern/ghost/SConscript | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 5a4572c164d..025559e11a4 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -154,6 +154,14 @@ if env['BF_GHOST_DEBUG']: else: sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp') +if env['WITH_BF_IME'] and window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): + defs.append('WITH_INPUT_IME') +elif env['WITH_BF_IME']: + print "IME input is only supported on Windows! Please disable WITH_BF_IME!" + Exit() +else: + sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp') + if env['WITH_BF_3DMOUSE']: defs.append('WITH_INPUT_NDOF') |