diff options
| author | julianeisel <julian_eisel@web.de> | 2014-12-08 01:57:51 +0300 |
|---|---|---|
| committer | julianeisel <julian_eisel@web.de> | 2014-12-08 01:57:51 +0300 |
| commit | 983c71931b1886d4349b6e964ece4622c8cd74fb (patch) | |
| tree | 6089c26bb99871af7b67816e92a16f8e1a846279 /intern | |
| parent | 12e5a325577ff99a2f470bd912dc7b6a41690930 (diff) | |
Fix non-Windows SCons compiling error after IME merge
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/SConscript | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index a41fadf9ac7..573e7057aee 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -154,12 +154,18 @@ if env['BF_GHOST_DEBUG']: else: sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp') -if env['WITH_BF_IME']: - if window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): - defs.append('WITH_INPUT_IME') - else: +if env['WITH_BF_IME'] and window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): + defs.append('WITH_INPUT_IME') +else: + try: sources.remove('intern' + os.sep + 'GHOST_ImeWin32.h') + except ValueError: + pass + + try: sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp') + except ValueError: + pass if env['WITH_BF_3DMOUSE']: defs.append('WITH_INPUT_NDOF') |