diff options
| author | julianeisel <julian_eisel@web.de> | 2014-12-11 02:22:17 +0300 |
|---|---|---|
| committer | julianeisel <julian_eisel@web.de> | 2014-12-11 02:22:17 +0300 |
| commit | c71c7f0e0b2d18bd095d3d7910b9de84bc0d2079 (patch) | |
| tree | 27c1b0cc40f43dec4a704c1446a89d67bb671c4b /intern/ghost/SConscript | |
| parent | 1e02a5ff433ab6fd387b71ffe525a56b8b5ea3b7 (diff) | |
Correction for non-Windows SCons compiling fix after IME Merge
As discussed in rB983c71931b1886d4, we should print a warning in case of building on non-Windows and WITH_BF_IME enabled. We also terminate build in this case, so the warning isn't scrolled away. Was worked out together with @sergey.
Diffstat (limited to 'intern/ghost/SConscript')
| -rw-r--r-- | intern/ghost/SConscript | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 573e7057aee..025559e11a4 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -156,16 +156,11 @@ else: 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: - try: - sources.remove('intern' + os.sep + 'GHOST_ImeWin32.h') - except ValueError: - pass - - try: - sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp') - except ValueError: - pass + sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp') if env['WITH_BF_3DMOUSE']: defs.append('WITH_INPUT_NDOF') |